Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assume standard linker behavior when using GNU ld on win32 or OS/2.

Browse Source 
Fixing mingw static build bustage.
Bug #221768 r=bsmedberg r=pedemonte


git-svn-id: svn://10.0.0.236/trunk@153034 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2004-02-20 20:43:21 +00:00
parent f35a56a2c6
commit e50fb2daee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/config/rules.mk
View File

@@ -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