mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

Fixing mingw static build bustage.
Bug #221768 r=bsmedberg r=pedemonte
This commit is contained in:
cls%seawood.org 2004-02-20 20:43:21 +00:00
Родитель 149ac0bb68
Коммит 32eb2c4962
1 изменённых файлов: 2 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
config/rules.mk
Просмотреть файл

@ -935,7 +935,7 @@ endif
# that are built using other static libraries. Confused...? # that are built using other static libraries. Confused...?
# #
ifdef SHARED_LIBRARY_LIBS 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)) ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
LOBJS += $(SHARED_LIBRARY_LIBS) LOBJS += $(SHARED_LIBRARY_LIBS)
endif endif
@ -952,7 +952,7 @@ endif
$(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) Makefile Makefile.in
rm -f $@ rm -f $@
ifneq (,$(filter-out OS2 WINNT, $(OS_ARCH))) ifneq (,$(GNU_LD)$(filter-out OS2 WINNT, $(OS_ARCH)))
ifdef SHARED_LIBRARY_LIBS ifdef SHARED_LIBRARY_LIBS
@rm -f $(SUB_LOBJS) @rm -f $(SUB_LOBJS)
@for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done @for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done