forked from pool/MozillaFirefox
27 lines
1004 B
Diff
27 lines
1004 B
Diff
|
From: Wolfgang Rosenauer
|
||
|
|
Subject: Build fails with --as-needed
|
||
|
|
References:
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
|
||
|
|
--- a/browser/components/build/Makefile.in
|
||
|
|
+++ b/browser/components/build/Makefile.in
|
||
|
|
@@ -68,7 +68,6 @@ endif
|
||
|
|
EXTRA_DSO_LDOPTS += \
|
||
|
|
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
|
||
|
|
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
||
|
|
- $(MOZ_COMPONENT_LIBS) \
|
||
|
|
$(NULL)
|
||
|
|
|
||
|
|
# migration requires mozreg, which doesn't build on WINCE; only include
|
||
|
|
@@ -80,6 +79,9 @@ SHARED_LIBRARY_LIBS += ../migration/src/
|
||
|
|
EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
|
||
|
|
endif
|
||
|
|
|
||
|
|
+# if built with --as-needed the NSPR libs need to be linked after mozreg_s
|
||
|
|
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||
|
|
+
|
||
|
|
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
|
||
|
|
# GTK2: Need to link with glib for GNOME shell service
|
||
|
|
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
|