Bug 1429875 - Do not take DIST_INSTALL into account when deciding to build static libraries. draft
authorChris Manchester <cmanchester@mozilla.com>
Tue, 20 Mar 2018 16:31:05 -0700
changeset 770315 d31565da9866d5c455719c751a94c824021b0a6c
parent 770314 182164ed7cc1081afc31e75a14c7fa4f8220a263
child 770316 cc03637d59c26ea88240dbfa83a642c53926be2f
push id103374
push userbmo:cmanchester@mozilla.com
push dateTue, 20 Mar 2018 23:37:52 +0000
bugs1429875
milestone61.0a1
Bug 1429875 - Do not take DIST_INSTALL into account when deciding to build static libraries. Now that we're no longer shipping the SDK we no longer need real libraries for the libraries that were created by this rule. MozReview-Commit-ID: ALATVGBayHu
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -95,38 +95,23 @@ endif # ENABLE_TESTS
 # Library rules
 #
 # 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)
 else
 LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 endif
-else
-# Only build actual library if it is installed in DIST/lib
-ifeq (,$(DIST_INSTALL)$(NO_EXPAND_LIBS))
-LIBRARY			:= $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
-else
-ifdef NO_EXPAND_LIBS
-LIBRARY			:= $(REAL_LIBRARY)
-else
-LIBRARY			:= $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
 endif
 endif
-endif
-endif # REAL_LIBRARY
-endif # LIBRARY
 
 ifndef HOST_LIBRARY
 ifdef HOST_LIBRARY_NAME
 HOST_LIBRARY		:= $(LIB_PREFIX)$(HOST_LIBRARY_NAME).$(LIB_SUFFIX)
 endif
 endif
 
 ifdef FORCE_SHARED_LIB