1 From: Wolfgang Rosenauer

     2 Subject: Build fails with --as-needed

     3 References:

     4 

     5 

     6 diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in

     7 --- a/browser/components/build/Makefile.in

     8 +++ b/browser/components/build/Makefile.in

     9 @@ -78,19 +78,21 @@ LOCAL_INCLUDES += -I$(srcdir)/../migrati

    10  SHARED_LIBRARY_LIBS += ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX)

    11  EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)

    12  endif

    13  

    14  # This has to come after the above chunk, because mozreg_s has dependencies on

    15  # stuff in MOZ_COMPONENT_LIBS.

    16  EXTRA_DSO_LDOPTS += \

    17  	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \

    18 -	$(MOZ_COMPONENT_LIBS) \

    19  	$(NULL)

    20  

    21 +# if built with --as-needed the NSPR libs need to be linked after mozreg_s

    22 +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

    23 +

    24  # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)

    25  # GTK2: Need to link with glib for GNOME shell service

    26  ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))

    27  EXTRA_DSO_LDOPTS += \

    28    $(TK_LIBS) \

    29    $(NULL)

    30  endif

    31