зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1429875 - Do not take DIST_INSTALL into account when deciding to build static libraries. r=glandium
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 --HG-- extra : rebase_source : a20905125e5ff1846ef29de12323ba7b0a58928b
This commit is contained in:
Родитель
3f63e1bbdb
Коммит
fb59fb974a
|
@ -100,28 +100,13 @@ endif # ENABLE_TESTS
|
|||
|
||||
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
|
||||
|
|
Загрузка…
Ссылка в новой задаче