Followup for bug 1041936 to unbreak spidermonkey fail-on-warnings builds. r=me

This commit is contained in:
Mike Hommey 2014-07-23 14:01:55 +09:00
parent 7cab62150a
commit 2a9a0b150f
2 changed files with 6 additions and 0 deletions

View File

@ -138,7 +138,12 @@ 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))

View File

@ -18,6 +18,7 @@ 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