Bug 1138824 - Simplify installation of import libraries to $(DIST)/lib. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 03 Mar 2015 17:18:07 +0900
changeset 235943 33ac0758a1f61c2461a8c7252147e14e655af55c
parent 235942 1a049b3a7e08573571d04e4ce49e632aaa513c18
child 235944 9d23ce7d6739dac92944ba1e72d8393310a52eba
push id57563
push usermh@glandium.org
push dateFri, 27 Mar 2015 00:42:26 +0000
treeherdermozilla-inbound@9d23ce7d6739 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1138824
milestone39.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
Bug 1138824 - Simplify installation of import libraries to $(DIST)/lib. r=gps The recursivemake backend sets IMPORT_LIBRARY to the same value as SHARED_LIBRARY on non-Windows platforms, so we can simply use IMPORT_LIBRARY everywhere.
config/makefiles/target_binaries.mk
--- a/config/makefiles/target_binaries.mk
+++ b/config/makefiles/target_binaries.mk
@@ -43,25 +43,20 @@ endif # LIBRARY
 
 ifdef SHARED_LIBRARY
 ifndef IS_COMPONENT
 SHARED_LIBRARY_FILES = $(SHARED_LIBRARY)
 SHARED_LIBRARY_DEST ?= $(FINAL_TARGET)
 SHARED_LIBRARY_TARGET = target
 INSTALL_TARGETS += SHARED_LIBRARY
 
-ifneq (,$(filter WINNT,$(OS_ARCH)))
+ifdef IMPORT_LIBRARY
 IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
-else
-IMPORT_LIB_FILES = $(SHARED_LIBRARY)
-endif
-
 IMPORT_LIB_DEST ?= $(DIST)/lib
 IMPORT_LIB_TARGET = target
-ifdef IMPORT_LIB_FILES
 INSTALL_TARGETS += IMPORT_LIB
 endif
 
 endif # ! IS_COMPONENT
 endif # SHARED_LIBRARY
 
 ifneq (,$(strip $(HOST_SIMPLE_PROGRAMS)$(HOST_PROGRAM)))
 HOST_PROGRAMS_EXECUTABLES = $(HOST_SIMPLE_PROGRAMS) $(HOST_PROGRAM)