Followup for bug 1041936 to unbreak spidermonkey fail-on-warnings builds. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 23 Jul 2014 14:01:55 +0900
changeset 195650 f5f7cf07eef6024579b9ea3efd2aad097c5f8cda
parent 195649 c71f854e6358af163f016af7661ce5f9d4151a0e
child 195651 7b37f7f3e377781038acdc2ab38a44ab10d395f3
push id27188
push usercbook@mozilla.com
push dateWed, 23 Jul 2014 13:53:43 +0000
treeherdermozilla-central@785acfd2ae48 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1041936
milestone34.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
Followup for bug 1041936 to unbreak spidermonkey fail-on-warnings builds. r=me
config/rules.mk
js/src/Makefile.in
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -133,17 +133,22 @@ endif # ENABLE_TESTS
 # If FORCE_STATIC_LIB is set, build a static library.
 # Otherwise, build a shared library.
 #
 
 ifndef LIBRARY
 ifdef REAL_LIBRARY
 # Don't build actual static library if a shared library is also built
 ifdef FORCE_SHARED_LIB
+# ... except when we really want one
+ifdef NO_EXPAND_LIBS
+LIBRARY			:= $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
+else
 LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
+endif
 else
 # Only build actual library if it is installed in DIST/lib or SDK
 ifeq (,$(SDK_LIBRARY)$(DIST_INSTALL)$(NO_EXPAND_LIBS))
 LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 else
 LIBRARY			:= $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 endif
 endif
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -13,16 +13,17 @@ ifneq ($(make_min_ver),$(firstword $(sor
 endif
 
 TOPLEVEL_BUILD := 1
 
 run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
 EXTRA_LIBS		+= $(NSPR_LIBS)
 
 DIST_INSTALL = 1
+NO_EXPAND_LIBS = 1
 
 ifdef JS_HAS_CTYPES
 ifdef MOZ_NATIVE_FFI
 LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
 endif
 
 ifdef MOZ_NATIVE_FFI
 OS_LIBS += $(MOZ_FFI_LIBS)