Bug 297677: when linking against static versions of components, explicitly

specify the static-lib pathnames, rather than hoping that the current library
search path finds the right (static) version of -lwhatever. r=bsmedberg, a=asa.
This commit is contained in:
shaver%mozilla.org 2005-06-17 12:13:06 +00:00
Родитель 6c6bd6dd00
Коммит c034eebe1f
1 изменённых файлов: 0 добавлений и 5 удалений

Просмотреть файл

@ -47,15 +47,10 @@ STATIC_REQUIRES += \
string \
$(NULL)
ifeq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH)))
STATIC_EXTRA_LIBS += \
$(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/components/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_COMPS)))) \
$(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(shell cat $(FINAL_LINK_LIBS)))) \
$(NULL)
else
STATIC_EXTRA_LIBS += -L$(DIST)/lib/components
STATIC_EXTRA_DSO_LIBS += $(shell cat $(FINAL_LINK_COMPS) $(FINAL_LINK_LIBS))
endif # OS2 || WINNT || WINCE
STATIC_COMPONENT_LIST := $(shell cat $(FINAL_LINK_COMP_NAMES))