Bug 1091377 - Don't use -static-libstdc++ when building with stlport. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 06 Jan 2015 15:26:22 +0900
changeset 239312 18557b56adbeb090e628ef48261da6d98425bc8a
parent 239311 11a25a9c085025371c2afd6ed869738d66698ad7
child 239313 2d03b2b604af335c57d8c54491e210b1b0d75758
push id7472
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 20:36:27 +0000
treeherdermozilla-aurora@300ca104f8fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1091377
milestone37.0a1
Bug 1091377 - Don't use -static-libstdc++ when building with stlport. r=mshal It turns out that while it may have been needed at the time it was added (which, retrospectively, I'm not even sure was the case), it definitely isn't needed anymore.
build/stlport/moz.build
--- a/build/stlport/moz.build
+++ b/build/stlport/moz.build
@@ -4,19 +4,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Library('stlport')
 # Keep the same name as the NDK-provided library, while using a shorter
 # name for the Library for convenience in moz.build.
 STATIC_LIBRARY_NAME = 'stlport_static'
 
-if not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    OS_LIBS += ['-static-libstdc++']
-
 FORCE_STATIC_LIB = True
 
 SOURCES += [
     'src/allocators.cpp',
     'src/bitset.cpp',
     'src/codecvt.cpp',
     'src/collate.cpp',
     'src/complex.cpp',