Bug 895248 - Move --enable-stdcxx-compat in build/unix/mozconfig.linu…

…x. r=ted
Brli · Jul 21, 2013 · ae7737a · ae7737a
1 parent cd8e2bb
commit ae7737a
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 48 deletions.
diff --git a/b2g/config/mozconfigs/linux32_gecko/nightly b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -9,9 +9,6 @@ ac_add_options --enable-signmar
 # Nightlies only since this has a cost in performance
 #ac_add_options --enable-js-diagnostics
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.

diff --git a/b2g/config/mozconfigs/linux64_gecko/nightly b/b2g/config/mozconfigs/linux64_gecko/nightly
@@ -9,9 +9,6 @@ ac_add_options --enable-signmar
 # Nightlies only since this has a cost in performance
 #ac_add_options --enable-js-diagnostics
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.

diff --git a/browser/config/mozconfigs/linux32/common-opt b/browser/config/mozconfigs/linux32/common-opt
@@ -6,9 +6,6 @@ ac_add_options --with-google-api-keyfile=/builds/gapi.data
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux32/debug b/browser/config/mozconfigs/linux32/debug
@@ -4,9 +4,6 @@ ac_add_options --enable-signmar
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux32/debug-asan b/browser/config/mozconfigs/linux32/debug-asan
@@ -8,9 +8,6 @@ ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

diff --git a/browser/config/mozconfigs/linux32/l10n-mozconfig b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -2,9 +2,6 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 . $topsrcdir/build/unix/mozconfig.linux32
 
 export MOZILLA_OFFICIAL=1

diff --git a/browser/config/mozconfigs/linux32/nightly-asan b/browser/config/mozconfigs/linux32/nightly-asan
@@ -10,9 +10,6 @@ ac_add_options --enable-codesighs
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

diff --git a/browser/config/mozconfigs/linux64/common-opt b/browser/config/mozconfigs/linux64/common-opt
@@ -6,9 +6,6 @@ ac_add_options --with-google-api-keyfile=/builds/gapi.data
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug
@@ -4,9 +4,6 @@ ac_add_options --enable-signmar
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 

diff --git a/browser/config/mozconfigs/linux64/debug-asan b/browser/config/mozconfigs/linux64/debug-asan
@@ -8,9 +8,6 @@ ac_add_options --enable-valgrind
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -9,7 +9,4 @@ export CXX="$topsrcdir/clang/bin/clang++"
 # Add the static checker
 ac_add_options --enable-clang-plugin
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/l10n-mozconfig b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -2,9 +2,6 @@ ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 . $topsrcdir/build/unix/mozconfig.linux
 
 export MOZILLA_OFFICIAL=1

diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/browser/config/mozconfigs/linux64/nightly-asan
@@ -10,9 +10,6 @@ ac_add_options --enable-codesighs
 
 . $topsrcdir/build/unix/mozconfig.asan
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 

diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
@@ -4,3 +4,6 @@ CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
 CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
 
 ac_add_options --enable-elf-hack
+
+# Avoid dependency on libstdc++ 4.7
+ac_add_options --enable-stdcxx-compat
diff --git a/xulrunner/config/mozconfigs/linux32/xulrunner b/xulrunner/config/mozconfigs/linux32/xulrunner
@@ -6,9 +6,6 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 

diff --git a/xulrunner/config/mozconfigs/linux32/xulrunner-qt b/xulrunner/config/mozconfigs/linux32/xulrunner-qt
@@ -6,9 +6,6 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 

diff --git a/xulrunner/config/mozconfigs/linux64/xulrunner b/xulrunner/config/mozconfigs/linux64/xulrunner
@@ -6,9 +6,6 @@ ac_add_options --disable-tests
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache