Back out 75e0d521bc2b, breaks standalone JS builds on Linux, at the very least. No bug, r=bustage
authorJeff Walden <jwalden@mit.edu>
Thu, 06 Dec 2012 17:08:01 -0800
changeset 115265 3877e6934b5688928b5d54ee45b29e7b9a344b03
parent 115264 7f8e7625b12e48e4309673f085edcff96988fe00
child 115266 c6079d201336e0d70ee5f3f84161b34eb3b1b6de
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbustage
milestone20.0a1
backs out75e0d521bc2b4f96e08b11a3344d8552d74f7638
Back out 75e0d521bc2b, breaks standalone JS builds on Linux, at the very least. No bug, r=bustage
js/src/Makefile.in
js/src/symverscript.in
toolkit/library/Makefile.in
toolkit/library/symverscript.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -534,28 +534,16 @@ include $(topsrcdir)/config/config.mk
 
 ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 # When building standalone, we need to include mfbt sources, and to declare
 # "exported" mfbt symbols on its behalf when we use its headers.
 include $(MFBT_ROOT)/sources.mk
 DEFINES += -DIMPL_MFBT
 endif
 
-# ensure symbol versions of shared library on linux do not conflict with those in libxul
-ifeq (Linux,$(OS_TARGET))
-EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-
-symverscript: symverscript.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
-		-DVERSION="$(subst -,_,$(LIBRARY_NAME))" $< > $@
-
-EXTRA_DEPS += symverscript
-
-endif
-
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 ifndef BUILD_OPT
 MOCHAFILE	= 1
 endif
 
 # Define keyword generator before rules.mk, see bug 323979 comment 50
 
deleted file mode 100644
--- a/js/src/symverscript.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#filter substitution
-@VERSION@ {
-	global: *;
-};
-
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -126,24 +126,16 @@ endif #}
 
 ifdef MOZ_IPDL_TESTS
 STATIC_LIBS += ipdlunittest_s
 endif
 
 ifeq (Linux,$(OS_ARCH))
 ifneq (Android,$(OS_TARGET))
 OS_LIBS += -lrt
-EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
-
-symverscript: symverscript.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
-		-DVERSION="XUL_$(MOZILLA_VERSION)" $< > $@
-
-EXTRA_DEPS += symverscript
-
 endif
 endif
 
 STATIC_LIBS += \
   xpcom_core \
   ucvutil_s \
   chromium_s \
   snappy_s \
deleted file mode 100644
--- a/toolkit/library/symverscript.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#filter substitution
-@VERSION@ {
-	global: *;
-};
-