|
1
|
1 |
From: Wolfgang Rosenauer
|
|
|
2 |
Subject: Build fails with --as-needed
|
|
|
3 |
References:
|
|
|
4 |
|
|
|
5 |
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
|
|
|
6 |
--- a/browser/components/build/Makefile.in
|
|
|
7 |
+++ b/browser/components/build/Makefile.in
|
|
|
8 |
@@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati
|
|
|
9 |
SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)
|
|
|
10 |
EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
|
|
|
11 |
endif
|
|
|
12 |
|
|
|
13 |
# This has to come after the above chunk, because mozreg_s has dependencies on
|
|
|
14 |
# stuff in MOZ_COMPONENT_LIBS.
|
|
|
15 |
EXTRA_DSO_LDOPTS += \
|
|
|
16 |
$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
|
|
|
17 |
- $(MOZ_COMPONENT_LIBS) \
|
|
|
18 |
$(NULL)
|
|
|
19 |
|
|
|
20 |
+# if built with --as-needed the NSPR libs need to be linked after mozreg_s
|
|
|
21 |
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
|
|
22 |
+
|
|
|
23 |
# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
|
|
|
24 |
# GTK2: Need to link with glib for GNOME shell service
|
|
|
25 |
ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
|
|
26 |
EXTRA_DSO_LDOPTS += \
|
|
|
27 |
$(TK_LIBS) \
|
|
|
28 |
$(NULL)
|
|
|
29 |
endif
|
|
|
30 |
|