Bug 1138824 - Remove NO_INSTALL_IMPORT_LIBRARY. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 03 Mar 2015 17:14:33 +0900
changeset 264914 1a049b3a7e08573571d04e4ce49e632aaa513c18
parent 264913 9ea27ee1d96d779ceffb8cecbfb3a924b83b5546
child 264915 33ac0758a1f61c2461a8c7252147e14e655af55c
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [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 - Remove NO_INSTALL_IMPORT_LIBRARY. r=gps NO_INSTALL_IMPORT_LIBRARY is only used in one place, and since we don't even use $(DIST)/lib for gecko, it actually doesn't make a difference presently.
config/makefiles/target_binaries.mk
mozglue/build/Makefile.in
--- a/config/makefiles/target_binaries.mk
+++ b/config/makefiles/target_binaries.mk
@@ -44,19 +44,17 @@ 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)))
-ifndef NO_INSTALL_IMPORT_LIBRARY
 IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
-endif # NO_INSTALL_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
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -8,22 +8,16 @@ DIST_INSTALL = 1
 # For FORCE_SHARED_LIB
 include $(topsrcdir)/config/config.mk
 
 ifeq (WINNT,$(OS_TARGET))
 mozglue.def: mozglue.def.in $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
 
 GARBAGE += mozglue.def
-
-ifdef MOZ_CRT
-# Don't install the import library if we use mozcrt
-NO_INSTALL_IMPORT_LIBRARY = 1
-endif
-
 endif
 
 include $(topsrcdir)/mozglue/build/replace_malloc.mk
 
 ifdef MOZ_LINKER
 ifeq (arm, $(TARGET_CPU))
 OS_LDFLAGS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
 endif