Bug 1411712 - Move symbol version script ldflags for js to moz.build r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Thu, 02 Nov 2017 11:47:48 -0700
changeset 443192 e2910375ccd8a7f64fb30ae30562c5102905309a
parent 443191 e173810afc6e201b4d109000dcc65c8b8bdd4bdc
child 443193 3d9a54a2b527420e5ee121ba9556f5ecc3dcda24
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1411712
milestone58.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1411712 - Move symbol version script ldflags for js to moz.build r=mshal MozReview-Commit-ID: D1NqJRFjVI2
js/src/build/Makefile.in
js/src/build/moz.build
--- a/js/src/build/Makefile.in
+++ b/js/src/build/Makefile.in
@@ -2,17 +2,16 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 # Ensure symbol versions of shared library on Linux do not conflict
 # with those in libxul.
 ifeq (Linux,$(OS_TARGET))
-OS_LDFLAGS += -Wl,-version-script,symverscript
 
 symverscript: symverscript.in
 	$(call py_action,preprocessor, \
 		-DVERSION='$(subst -,_,$(LIBRARY_NAME))' $< -o $@)
 
 EXTRA_DEPS += symverscript
 endif
 
--- a/js/src/build/moz.build
+++ b/js/src/build/moz.build
@@ -70,8 +70,13 @@ if CONFIG['OS_ARCH'] == 'SunOS':
         'socket',
     ]
 
 OS_LIBS += CONFIG['REALTIME_LIBS']
 
 NO_EXPAND_LIBS = True
 
 DIST_INSTALL = True
+
+# Ensure symbol versions of shared library on Linux do not conflict
+# with those in libxul.
+if CONFIG['OS_TARGET'] == 'Linux':
+    LDFLAGS += ['-Wl,-version-script,symverscript']