From 32eb2c4962f679c070a22f32ac92a6426b9b0bb0 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Fri, 20 Feb 2004 20:43:21 +0000 Subject: [PATCH] Assume standard linker behavior when using GNU ld on win32 or OS/2. Fixing mingw static build bustage. Bug #221768 r=bsmedberg r=pedemonte --- config/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 3324f4ff27d..0b101b2fbc1 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -935,7 +935,7 @@ endif # that are built using other static libraries. Confused...? # ifdef SHARED_LIBRARY_LIBS -ifeq (,$(filter-out OS2 WINNT, $(OS_ARCH))) +ifeq (,$(GNU_LD)$(filter-out OS2 WINNT, $(OS_ARCH))) ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) LOBJS += $(SHARED_LIBRARY_LIBS) endif @@ -952,7 +952,7 @@ endif $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in rm -f $@ -ifneq (,$(filter-out OS2 WINNT, $(OS_ARCH))) +ifneq (,$(GNU_LD)$(filter-out OS2 WINNT, $(OS_ARCH))) ifdef SHARED_LIBRARY_LIBS @rm -f $(SUB_LOBJS) @for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done