diff --git a/config/config.mk b/config/config.mk index 50b0507919..4c548e16bd 100644 --- a/config/config.mk +++ b/config/config.mk @@ -275,10 +275,6 @@ 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 @@ -676,24 +672,6 @@ EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) endif EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) -# EXPAND_LIBNAME - $(call EXPAND_LIBNAME,foo) -# expands to $(LIB_PREFIX)foo.$(LIB_SUFFIX) or -lfoo, depending on linker -# arguments syntax. Should only be used for system libraries - -# EXPAND_LIBNAME_PATH - $(call EXPAND_LIBNAME_PATH,foo,dir) -# expands to dir/$(LIB_PREFIX)foo.$(LIB_SUFFIX) - -# EXPAND_MOZLIBNAME - $(call EXPAND_MOZLIBNAME,foo) -# expands to $(DIST)/lib/$(LIB_PREFIX)foo.$(LIB_SUFFIX) - -ifdef GNU_CC -EXPAND_LIBNAME = $(addprefix -l,$(1)) -else -EXPAND_LIBNAME = $(foreach lib,$(1),$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) -endif -EXPAND_LIBNAME_PATH = $(foreach lib,$(1),$(2)/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) -EXPAND_MOZLIBNAME = $(foreach lib,$(1),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) - # Include internal ply only if needed ifndef MOZ_SYSTEM_PLY PLY_INCLUDE = -I$(MOZILLA_DIR)/other-licenses/ply diff --git a/config/rules.mk b/config/rules.mk index 38f3d7427e..19b2afc057 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -446,12 +446,6 @@ ifeq ($(OS_ARCH),GNU) OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024 endif -ifeq ($(OS_ARCH),WINNT) -ifdef USE_DELAYIMP -OS_LIBS += $(call EXPAND_LIBNAME,delayimp) -endif -endif - # # MINGW32 #