Bug 1061338 Port DELAYLOAD_LDFLAGS from bug 944800 r=Standard8 AURORA_BASE_20140902
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Tue, 02 Sep 2014 08:39:23 +0100
changeset 20825 9c4a5f203c8b39aef59f3783504e6d18815475cc
parent 20824 11d9268bc3a0f6030aaf547b86a7e3741ac92a0a
child 20826 b5a0add9fb18e22fde9107c1b072a4c995f3e7e6
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs1061338, 944800
Bug 1061338 Port DELAYLOAD_LDFLAGS from bug 944800 r=Standard8 a=Standard8 for checkin to a CLOSED TREE
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -341,16 +341,19 @@ OS_CFLAGS += $(if $(filter $(notdir $<),
 OS_CXXFLAGS += $(if $(filter $(notdir $<),$(notdir $(NO_PROFILE_GUIDED_OPTIMIZE))),,$(PROFILE_USE_CFLAGS))
 OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
 ifeq (WINNT,$(OS_ARCH))
 AR_FLAGS += -LTCG
 endif
 endif # MOZ_PROFILE_USE
 endif # NO_PROFILE_GUIDED_OPTIMIZE
 
+ifdef _MSC_VER
+OS_LDFLAGS += $(DELAYLOAD_LDFLAGS)
+endif # _MSC_VER
 
 # Does the makefile specifies the internal XPCOM API linkage?
 ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
 DEFINES += -DMOZILLA_INTERNAL_API
 endif
 
 # Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're
 # building libxul libraries