Bug 1411712 - Move symbol version script ldflags for js to moz.build draft
authorChris Manchester <cmanchester@mozilla.com>
Thu, 02 Nov 2017 14:14:58 -0700
changeset 692249 e7c6be870aad899540e61711df1aa0fdf2a75ab4
parent 692248 42005cd3f33aced7c8cf65b301ab408704e0ed31
child 692250 b16038af4f242f4623b5e8d89b359874c1b53cd2
push id87463
push userbmo:cmanchester@mozilla.com
push dateThu, 02 Nov 2017 21:50:29 +0000
bugs1411712
milestone58.0a1
Bug 1411712 - Move symbol version script ldflags for js to moz.build 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']