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