Bug 1036894 part 9 - Replace all EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS with EXTRA_LIBS, OS_LIBS or OS_LDFLAGS, appropriately. r=gps

OS_LIBS for libraries that are not part of the gecko tree, EXTRA_LIBS for libraries, such as NSPR, that are in the tree, but are not handled by moz.build just yet. Those EXTRA_LIBS may also come from a system library. However, in cases where the expanded variables are always empty for the in-tree case, OS_LIBS is used (as for, e.g. MOZ_ZLIB_LIBS). OS_LDFLAGS is used exclusively for non-library linker flags. Always pass EXTRA_LIBS before OS_LIBS on linker command lines. Forbid EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS in Makefiles.
2024-09-13 09:24:08 -07:00 · 2014-07-23 13:31:02 +09:00 · 2014-07-23 13:31:02 +09:00 · 71623acdd6
commit 71623acdd6
parent e5c43ef995
56 changed files with 178 additions and 179 deletions
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@ -10,7 +10,7 @@ PREF_JS_EXPORTS = $(srcdir)/b2g.js
 ifndef LIBXUL_SDK

 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  -lui \
  -lEGL \
  -lhardware_legacy \
@ -19,7 +19,7 @@ LIBS += \
  $(MOZ_ZLIB_LIBS) \
  $(NULL)
 ifeq ($(ANDROID_VERSION),$(findstring $(ANDROID_VERSION),17 18 19))
-LIBS += \
+OS_LIBS += \
  -lgui \
  -lsuspend \
  $(NULL)
@ -27,7 +27,7 @@ endif
 endif

 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  -lbinder \
  -lutils \
  $(NULL)
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -26,11 +26,11 @@ endif #} LIBXUL_SDK
 # Build a binary bootstrapping with XRE_main

 ifdef MOZ_LINKER
-LIBS += $(MOZ_ZLIB_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif

 ifdef HAVE_CLOCK_MONOTONIC
-LIBS += $(REALTIME_LIBS)
+OS_LIBS += $(REALTIME_LIBS)
 endif

 ifndef MOZ_WINCONSOLE
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -10,14 +10,14 @@ ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
 	$(NULL)

 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 # GTK2: Need to link with glib for GNOME shell service
 ifneq (,$(filter cocoa gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
  $(TK_LIBS) \
  $(NULL)
 endif
--- a/config/config.mk
+++ b/config/config.mk
@ -40,6 +40,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  CMMSRCS \
  CPP_UNIT_TESTS \
  DIRS \
+  EXTRA_DSO_LDOPTS \
  EXTRA_PP_COMPONENTS \
  EXTRA_PP_JS_MODULES \
  FORCE_SHARED_LIB \
@ -56,6 +57,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  JS_MODULES_PATH \
  LD_VERSION_SCRIPT \
  LIBRARY_NAME \
+  LIBS \
  MAKE_FRAMEWORK \
  MODULE \
  MSVC_ENABLE_PGO \
@ -65,6 +67,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  RESOURCE_FILES \
  SDK_HEADERS \
  SDK_LIBRARY \
+  SHARED_LIBRARY_LIBS \
  SHARED_LIBRARY_NAME \
  SIMPLE_PROGRAMS \
  SONAME \
@ -771,7 +774,7 @@ CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\
 endif

 ifdef MOZ_LIBSTDCXX_TARGET_VERSION
-EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat)
+OS_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/build/unix/stdc++compat)
 endif
 ifdef MOZ_LIBSTDCXX_HOST_VERSION
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/build/unix/stdc++compat)
--- a/config/rules.mk
+++ b/config/rules.mk
@ -705,7 +705,7 @@ ifdef MOZ_PROFILE_GENERATE
 	touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
 endif
 else # !WINNT || GNU_CC
-	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS)
+	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS)
 	$(call CHECK_BINARY,$@)
 endif # WINNT && !GNU_CC

@ -761,7 +761,7 @@ ifdef MSMANIFEST_TOOL
 	fi
 endif	# MSVC with manifest tool
 else
-	$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(STLPORT_LIBS)
+	$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(STLPORT_LIBS)
 	$(call CHECK_BINARY,$@)
 endif # WINNT && !GNU_CC

@ -792,13 +792,13 @@ endif
 $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 	$(REPORT_BUILD)
 	$(RM) $(LIBRARY)
-	$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(SHARED_LIBRARY_LIBS)
+	$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(SHARED_LIBRARY_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))

 $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 # When we only build a library descriptor, blow out any existing library
 	$(REPORT_BUILD)
 	$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY))
-	$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(SHARED_LIBRARY_LIBS)
+	$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(SHARED_LIBRARY_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))

 ifeq ($(OS_ARCH),WINNT)
 # Import libraries are created by the rules creating shared libraries.
@ -842,10 +842,10 @@ ifdef DTRACE_LIB_DEPENDENT
 ifndef XP_MACOSX
 	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
 endif
-	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
+	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
 	@$(RM) $(DTRACE_PROBE_OBJ)
 else # ! DTRACE_LIB_DEPENDENT
-	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
+	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
 endif # DTRACE_LIB_DEPENDENT
 	$(call CHECK_BINARY,$@)

--- a/dom/plugins/test/testplugin/testplugin.mk
+++ b/dom/plugins/test/testplugin/testplugin.mk
@ -7,7 +7,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 include $(topsrcdir)/config/config.mk
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 CFLAGS          += $(MOZ_QT_CFLAGS)
-EXTRA_DSO_LDOPTS = \
+OS_LIBS += \
                $(MOZ_QT_LIBS) \
                $(XLDFLAGS) \
                $(XLIBS)
@ -40,5 +40,5 @@ include $(topsrcdir)/config/rules.mk
 ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
+OS_LIBS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
 endif
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@ -5,7 +5,7 @@

 LOCAL_INCLUDES	= $(MOZ_GNOMEVFS_CFLAGS)

-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 		   $(NSPR_LIBS) \
 		   $(MOZ_GNOMEVFS_LIBS) \
 		   $(NULL)
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS		+= \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@ -9,13 +9,13 @@ endif
 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
 WRAP_LDFLAGS =
 else
-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)
 endif

 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  -lbinder \
  -lutils \
  $(NULL)
@ -38,9 +38,6 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH),WINNT) #{
-
-LIBS += $(NSPR_LIBS)
-
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
 EXTRA_DEPS += plugin-container.exe.manifest
--- a/ipc/ipdl/test/cxx/app/Makefile.in
+++ b/ipc/ipdl/test/cxx/app/Makefile.in
@ -4,10 +4,6 @@

 NSDISTMODE = copy

-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -15,7 +15,7 @@ endif
 TOPLEVEL_BUILD := 1

 run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
-LIBS		+= $(NSPR_LIBS)
+EXTRA_LIBS		+= $(NSPR_LIBS)

 DIST_INSTALL = 1

@ -25,9 +25,9 @@ LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
 endif

 ifdef MOZ_NATIVE_FFI
-EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS)
+OS_LIBS += $(MOZ_FFI_LIBS)
 else
-SHARED_LIBRARY_LIBS += \
+EXTRA_LIBS += \
    ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
    $(NULL)
 endif
@ -41,8 +41,6 @@ endif # JS_HAS_CTYPES

 DASH_R		= -r

-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
-
 # Define keyword generator before rules.mk, see bug 323979 comment 50

 GARBAGE += jsautokw.h host_jskwgen$(HOST_BIN_SUFFIX)
@ -61,7 +59,7 @@ endif
 # Ensure symbol versions of shared library on Linux do not conflict
 # with those in libxul.
 ifeq (Linux,$(OS_TARGET))
-EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
+OS_LDFLAGS += -Wl,-version-script,symverscript

 symverscript: symverscript.in
 	$(call py_action,preprocessor, \
@ -203,23 +201,19 @@ endif

 # HP-UX does not require the extra linking of "-lm"
 ifeq (,$(filter HP-UX WINNT,$(OS_ARCH)))
-EXTRA_LIBS	+= -lm
+OS_LIBS	+= -lm
 endif

 CFLAGS += $(MOZ_ZLIB_CFLAGS)
-EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)

-ifdef MOZ_SHARED_ICU
-EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
-else
-SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
-endif
+EXTRA_LIBS += $(MOZ_ICU_LIBS)

 ifeq ($(OS_ARCH),FreeBSD)
-EXTRA_LIBS	+= -pthread
+OS_LIBS	+= -pthread
 endif
 ifeq ($(OS_ARCH),Linux)
-EXTRA_LIBS	+= -ldl
+OS_LIBS	+= -ldl
 endif
 # Silence warnings on AIX/HP-UX from non-GNU compilers
 ifndef GNU_CC
@ -247,7 +241,7 @@ CXXFLAGS += -mcpu=v9
 endif # GNU_CC

 endif
-EXTRA_LIBS	+= -lposix4 -ldl -lnsl -lsocket
+OS_LIBS	+= -lposix4 -ldl -lnsl -lsocket
 endif

 SCRIPTS = $(JS_CONFIG_NAME)
--- a/js/src/gdb/Makefile.in
+++ b/js/src/gdb/Makefile.in
@ -4,13 +4,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+EXTRA_LIBS += $(NSPR_LIBS)
+OS_LIBS +=  $(MOZ_ZLIB_LIBS)

 ifdef MOZ_SHARED_ICU
-EXTRA_LIBS += $(MOZ_ICU_LIBS)
+OS_LIBS += $(MOZ_ICU_LIBS)
 endif

-EXTRA_LIBS += $(MOZ_FFI_LIBS)
+OS_LIBS += $(MOZ_FFI_LIBS)

 # Place a GDB Python auto-load file next to the gdb-tests executable, both
 # in the build directory and in the dist/bin directory.
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@ -4,13 +4,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS      += $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+EXTRA_LIBS      += $(NSPR_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)

 ifdef MOZ_SHARED_ICU
-EXTRA_LIBS += $(MOZ_ICU_LIBS)
+OS_LIBS += $(MOZ_ICU_LIBS)
 endif

-EXTRA_LIBS += $(MOZ_FFI_LIBS)
+OS_LIBS += $(MOZ_FFI_LIBS)

 ifdef QEMU_EXE
 MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
@ -21,5 +22,3 @@ endif
 PP_TARGETS += JSAPI_TESTS_AUTOLOAD
 JSAPI_TESTS_AUTOLOAD := jsapi-tests-gdb.py.in
 JSAPI_TESTS_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(srcdir)/..)
-
-include $(topsrcdir)/config/rules.mk
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@ -4,12 +4,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS      += $(NSPR_LIBS) $(EDITLINE_LIBS) $(MOZ_ZLIB_LIBS)
+EXTRA_LIBS      += $(NSPR_LIBS)
+OS_LIBS += $(EDITLINE_LIBS) $(MOZ_ZLIB_LIBS)
 ifdef MOZ_NATIVE_FFI
-EXTRA_LIBS += $(MOZ_FFI_LIBS)
+OS_LIBS += $(MOZ_FFI_LIBS)
 endif
 ifdef MOZ_SHARED_ICU
-EXTRA_LIBS += $(MOZ_ICU_LIBS)
+OS_LIBS += $(MOZ_ICU_LIBS)
 endif

 ifeq ($(OS_ARCH),Darwin)
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@ -5,8 +5,6 @@

 SDK_BINARY	= $(PROGRAM)

-LIBS +=	$(NSPR_LIBS)
+EXTRA_LIBS +=	$(NSPR_LIBS)

 NSDISTMODE = copy
-
-include $(topsrcdir)/config/rules.mk
--- a/js/xpconnect/tests/Makefile.in
+++ b/js/xpconnect/tests/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@ -9,7 +9,7 @@ MANIFEST = xpctest.manifest
 MANIFEST_PATH = $(testxpcobjdir)/$(componentdir)
 PP_TARGETS += MANIFEST

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)

--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 ifeq (WINNT,$(OS_TARGET))
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
+EXTRA_LIBS += $(NSPR_LIBS)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32)
 endif

--- a/media/libcubeb/tests/Makefile.in
+++ b/media/libcubeb/tests/Makefile.in
@ -4,12 +4,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 ifeq ($(OS_TARGET),Darwin)
-  LIBS += -framework AudioUnit -framework CoreAudio
+  OS_LDFLAGS += -framework AudioUnit -framework CoreAudio
 else
  ifeq ($(OS_TARGET), OpenBSD)
-    LIBS += -lsndio
+    OS_LIBS += -lsndio
  else
-    LIBS += $(MOZ_ALSA_LIBS) \
+    OS_LIBS += $(MOZ_ALSA_LIBS) \
            $(MOZ_PULSEAUDIO_LIBS)
  endif
 endif
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@ -3,15 +3,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)

 ifdef MOZ_NATIVE_NSS
-LIBS += $(NSS_LIBS)
+EXTRA_LIBS += $(NSS_LIBS)
 else
 # Statically linking NSS libssl ensures that we can debug NSS too
-LIBS += \
+EXTRA_LIBS += \
  $(DEPTH)/dist/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
  $(DEPTH)/dist/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  $(DEPTH)/dist/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
@ -19,7 +19,7 @@ LIBS += \
 endif

 ifeq ($(OS_TARGET), Android)
-LIBS += \
+EXTRA_LIBS += \
  $(STLPORT_LDFLAGS) \
  $(STLPORT_LIBS) \
  $(NULL)
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@ -2,21 +2,24 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/. */

-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NSS_LIBS) \
+  $(NULL)
+
+OS_LIBS += \
  $(MOZ_WEBRTC_X11_LIBS) \
  $(REALTIME_LIBS) \
  $(NULL)

 ifdef MOZ_ALSA
-LIBS += \
+OS_LIBS += \
  $(MOZ_ALSA_LIBS) \
  $(NULL)
 endif

 ifeq ($(OS_TARGET),Android)
-LIBS += \
+EXTRA_LIBS += \
  $(STLPORT_LDFLAGS) \
  $(STLPORT_LIBS) \
  $(NULL)
@ -26,25 +29,25 @@ CPPFLAGS += \
 endif

 ifdef MOZ_NATIVE_JPEG
-LIBS += \
+OS_LIBS += \
  $(MOZ_JPEG_LIBS) \
  $(NULL)
 endif

 ifdef MOZ_NATIVE_LIBVPX
-LIBS += \
+OS_LIBS += \
  $(MOZ_LIBVPX_LIBS) \
  $(NULL)
 endif

 ifndef MOZ_TREE_PIXMAN
-LIBS += \
+OS_LIBS += \
  $(MOZ_PIXMAN_LIBS) \
  $(NULL)
 endif

 ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  $(XLIBS) \
  $(MOZ_GTK2_LIBS) \
  -lgmodule-2.0 -lgthread-2.0 \
@ -52,14 +55,14 @@ LIBS += \
 endif

 ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  $(MOZ_GTK3_LIBS) \
  $(FT2_LIBS) \
  $(NULL)
 endif

 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-LIBS += \
+OS_LIBS += \
  $(XLIBS) \
  $(TK_LIBS) \
  $(MOZ_PANGO_LIBS) \
@ -67,21 +70,20 @@ LIBS += \
 endif

 ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
-LIBS += \
+OS_LIBS += \
  $(MOZ_CAIRO_OSLIBS) \
  $(NULL)
 endif

 ifeq ($(OS_TARGET),Darwin)
-LIBS += \
+OS_LIBS += \
  $(TK_LIBS) \
  $(NULL)
 endif

 ifdef MOZ_NATIVE_ZLIB
-LIBS += $(MOZ_ZLIB_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif

 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/media/webrtc/webrtc-config.mk
-include $(topsrcdir)/config/rules.mk
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@ -18,7 +18,7 @@ HOST_CFLAGS += \
  $(NULL)

 ifdef MOZ_ENABLE_SIGNMAR
-LIBS += \
+EXTRA_LIBS += \
  $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
  $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
  $(NSPR_LIBS) \
@ -27,10 +27,10 @@ endif

 ifeq ($(HOST_OS_ARCH),WINNT)
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
-EXTRA_LIBS += $(call EXPAND_LIBNAME,ws2_32)
+OS_LIBS += $(call EXPAND_LIBNAME,ws2_32)
 ifdef MOZ_ENABLE_SIGNMAR
-EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32)
-EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32)
+OS_LIBS += $(call EXPAND_LIBNAME,crypt32)
+OS_LIBS += $(call EXPAND_LIBNAME,advapi32)
 endif
 endif

--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@ -12,7 +12,7 @@ MOZ_GLUE_LDFLAGS = # Don't link against ourselves

 ifneq (,$(ZLIB_IN_MOZGLUE)$(MOZ_LINKER))
 ifdef MOZ_NATIVE_ZLIB
-EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
+EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
 endif
 endif

@ -28,14 +28,14 @@ NO_INSTALL_IMPORT_LIBRARY = 1
 endif


-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 	$(call EXPAND_LIBNAME,version) \
 	$(NULL)

 endif

 ifeq (Darwin_1,$(OS_TARGET)_$(MOZ_REPLACE_MALLOC))
-EXTRA_DSO_LDOPTS += \
+OS_LDFLAGS += \
  -Wl,-U,_replace_init \
  -Wl,-U,_replace_malloc \
  -Wl,-U,_replace_posix_memalign \
@ -53,21 +53,21 @@ EXTRA_DSO_LDOPTS += \
  $(NULL)

 ifneq ($(MOZ_REPLACE_MALLOC_LINKAGE),compiler support)
-EXTRA_DSO_LDOPTS += -flat_namespace
+OS_LDFLAGS += -flat_namespace
 endif
 ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
-EXTRA_DSO_LDOPTS += -Wl,-weak_library,$(DEPTH)/memory/replace/dummy/$(DLL_PREFIX)replace_malloc$(DLL_SUFFIX)
+OS_LDFLAGS += -Wl,-weak_library,$(DEPTH)/memory/replace/dummy/$(DLL_PREFIX)replace_malloc$(DLL_SUFFIX)
 endif
 endif

 ifeq (android, $(MOZ_WIDGET_TOOLKIT))
 # To properly wrap jemalloc's pthread_atfork call.
-EXTRA_DSO_LDOPTS += -Wl,--wrap=pthread_atfork
+OS_LDFLAGS += -Wl,--wrap=pthread_atfork
 endif

 ifdef MOZ_LINKER
 ifeq (arm, $(TARGET_CPU))
-EXTRA_DSO_LDOPTS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
+OS_LDFLAGS += -Wl,-version-script,$(srcdir)/arm-eabi-filter
 endif

 endif
--- a/mozglue/tests/Makefile.in
+++ b/mozglue/tests/Makefile.in
@ -6,7 +6,7 @@ ifdef MOZ_LINKER
 # Only link against the linker, not mozglue
 MOZ_GLUE_PROGRAM_LDFLAGS =
 MOZ_GLUE_LDFLAGS =
-EXTRA_LIBS = $(MOZ_ZLIB_LIBS)
+OS_LIBS = $(MOZ_ZLIB_LIBS)
 endif

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS		+= \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@ -6,7 +6,7 @@



-LIBS	+= \
+EXTRA_LIBS	+= \
 		  $(NSPR_LIBS) \
 		  $(NULL)

--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS	+= \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS	+= \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/rdf/tests/triplescat/Makefile.in
+++ b/rdf/tests/triplescat/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS	+= \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@ -325,12 +325,12 @@ SUFFIX = .$(LIB_SUFFIX)
 endif

 # Fold NSPR libs
-EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/pr/src/$(LIB_PREFIX)nspr4$(SUFFIX)
-EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/ds/$(LIB_PREFIX)plds4$(SUFFIX)
-EXTRA_DSO_LDOPTS += $(DEPTH)/nsprpub/lib/libc/src/$(LIB_PREFIX)plc4$(SUFFIX)
+EXTRA_LIBS += $(DEPTH)/nsprpub/pr/src/$(LIB_PREFIX)nspr4$(SUFFIX)
+EXTRA_LIBS += $(DEPTH)/nsprpub/lib/ds/$(LIB_PREFIX)plds4$(SUFFIX)
+EXTRA_LIBS += $(DEPTH)/nsprpub/lib/libc/src/$(LIB_PREFIX)plc4$(SUFFIX)

 # Add all static libraries for nss, smime, ssl and nssutil
-SHARED_LIBRARY_LIBS += $(addprefix ../,$(NSS_STATIC_LIBS))
+EXTRA_LIBS += $(addprefix ../,$(NSS_STATIC_LIBS))

 nss_def_file := $(srcdir)/nss.def

@ -368,7 +368,7 @@ EXPAND_LIBS_EXEC += --extract

 $(SHARED_LIBRARY): $(addprefix ../,$(NSS_STATIC_LIBS))

-EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
+OS_LIBS += $(REALTIME_LIBS)

 ifdef IMPORT_LIB_SUFFIX
 IMPORT_PREFIX = $(LIB_PREFIX)
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
+++ b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
@ -6,7 +6,7 @@

 include $(topsrcdir)/config/config.mk

-LIBS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NSS_LIBS) \
  $(NULL)
--- a/security/sandbox/win/src/sandboxbroker/Makefile.in
+++ b/security/sandbox/win/src/sandboxbroker/Makefile.in
@ -4,7 +4,7 @@
 #
 MOZ_GLUE_LDFLAGS =

-SHARED_LIBRARY_LIBS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
 	$(NULL)

--- a/startupcache/test/Makefile.in
+++ b/startupcache/test/Makefile.in
@ -3,4 +3,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += $(NSPR_LIBS)
+EXTRA_LIBS += $(NSPR_LIBS)
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@ -3,7 +3,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
+	$(NULL)
+
+OS_LIBS += \
 	$(SQLITE_LIBS) \
 	$(NULL)
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS = \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NSS_LIBS) \
  $(NULL)
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
+EXTRA_LIBS += $(NSPR_LIBS)

 UNIT_FILES = $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
 UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
--- a/toolkit/library/libxul.mk
+++ b/toolkit/library/libxul.mk
@ -18,7 +18,7 @@ endif #}
 ifeq (Linux,$(OS_ARCH))
 ifneq (Android,$(OS_TARGET))
 OS_LIBS += -lrt
-EXTRA_DSO_LDOPTS += -Wl,-version-script,symverscript
+OS_LDFLAGS += -Wl,-version-script,symverscript

 symverscript: $(topsrcdir)/toolkit/library/symverscript.in
 	$(call py_action,preprocessor, \
@ -32,8 +32,11 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 OS_LIBS += -lcups
 endif

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
  $(NSS_LIBS) \
+  $(NULL)
+
+OS_LIBS += \
  $(MOZ_CAIRO_OSLIBS) \
  $(MOZ_WEBRTC_X11_LIBS) \
  $(MOZ_APP_EXTRA_LIBS) \
@ -42,46 +45,46 @@ EXTRA_DSO_LDOPTS += \

 ifdef ENABLE_INTL_API
 ifneq (,$(JS_SHARED_LIBRARY)$(MOZ_NATIVE_ICU))
-EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
+OS_LIBS += $(MOZ_ICU_LIBS)
 endif
 endif

 ifdef MOZ_NATIVE_FFI
-EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS)
+OS_LIBS += $(MOZ_FFI_LIBS)
 endif

 ifdef MOZ_NATIVE_JPEG
-EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS)
+OS_LIBS += $(MOZ_JPEG_LIBS)
 endif

 ifdef MOZ_NATIVE_PNG
-EXTRA_DSO_LDOPTS += $(MOZ_PNG_LIBS)
+OS_LIBS += $(MOZ_PNG_LIBS)
 endif

 ifdef MOZ_NATIVE_ZLIB
-EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif

 ifdef MOZ_NATIVE_HUNSPELL
-EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
+OS_LIBS += $(MOZ_HUNSPELL_LIBS)
 endif

 ifdef MOZ_NATIVE_LIBEVENT
-EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
+OS_LIBS += $(MOZ_LIBEVENT_LIBS)
 endif

 ifdef MOZ_NATIVE_LIBVPX
-EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS)
+OS_LIBS += $(MOZ_LIBVPX_LIBS)
 endif

 ifndef MOZ_TREE_PIXMAN
-EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
+OS_LIBS += $(MOZ_PIXMAN_LIBS)
 endif

 ifdef MOZ_WEBRTC
 ifeq (WINNT,$(OS_TARGET))
 ifndef MOZ_HAS_WINSDK_WITH_D3D
-EXTRA_DSO_LDOPTS += \
+OS_LDFLAGS += \
  -LIBPATH:'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_D3D_CPU_SUFFIX)' \
  $(NULL)
 endif
@ -90,11 +93,11 @@ endif
 endif

 ifdef MOZ_ALSA
-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+OS_LIBS += $(MOZ_ALSA_LIBS)
 endif

 ifdef HAVE_CLOCK_MONOTONIC
-EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
+OS_LIBS += $(REALTIME_LIBS)
 endif

 ifeq (android,$(MOZ_WIDGET_TOOLKIT))
@ -133,9 +136,9 @@ ifdef MOZ_DIRECTSHOW
 OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
 endif

-EXTRA_DSO_LDOPTS += $(ICONV_LIBS)
+OS_LIBS += $(ICONV_LIBS)

-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
+EXTRA_LIBS += $(NSPR_LIBS)

 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 OS_LIBS += \
@ -144,45 +147,45 @@ OS_LIBS += \
 endif

 ifeq (OpenBSD,$(OS_ARCH))
-EXTRA_DSO_LDOPTS += -lsndio
+OS_LIBS += -lsndio
 endif

 ifdef MOZ_ENABLE_DBUS
-EXTRA_DSO_LDOPTS += $(MOZ_DBUS_GLIB_LIBS)
+OS_LIBS += $(MOZ_DBUS_GLIB_LIBS)
 endif

 ifdef MOZ_WIDGET_GTK
 ifdef MOZ_ENABLE_GTK3
-EXTRA_DSO_LDOPTS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS))
+OS_LIBS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS))
 else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
+OS_LIBS += $(TK_LIBS)
 endif
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(XT_LIBS) -lgthread-2.0
-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+OS_LIBS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(XT_LIBS) -lgthread-2.0
+OS_LIBS += $(FT2_LIBS)
 endif

 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS)
-EXTRA_DSO_LDOPTS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
+OS_LIBS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS)
+OS_LIBS += $(FT2_LIBS) $(MOZ_PANGO_LIBS)
 endif

 ifdef MOZ_TREE_FREETYPE
-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+OS_LIBS += $(FT2_LIBS)
 endif

 ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
-EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
+OS_LIBS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
 endif

 ifdef MOZ_ENABLE_LIBPROXY
-EXTRA_DSO_LDOPTS += $(MOZ_LIBPROXY_LIBS)
+OS_LIBS += $(MOZ_LIBPROXY_LIBS)
 endif

 ifeq ($(OS_ARCH),SunOS)
 ifdef GNU_CC
-EXTRA_DSO_LDOPTS += -lelf
+OS_LIBS += -lelf
 else
-EXTRA_DSO_LDOPTS += -lelf -ldemangle
+OS_LIBS += -lelf -ldemangle
 endif
 endif

@ -201,12 +204,12 @@ endif
 endif # WINNT

 ifdef MOZ_ENABLE_QT
-EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)
+LIBS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)
 endif

 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifdef MOZ_GSTREAMER
-EXTRA_DSO_LDOPTS += $(GSTREAMER_LIBS)
+LIBS += $(GSTREAMER_LIBS)
 endif
 endif

@ -235,7 +238,7 @@ endif
 # the default section rules with those from the script instead of
 # supplementing them. Which leads to a lib with a huge load of sections.
 ifdef LD_IS_BFD
-EXTRA_DSO_LDOPTS += $(topsrcdir)/toolkit/library/StaticXULComponents.ld
+OS_LDFLAGS += $(topsrcdir)/toolkit/library/StaticXULComponents.ld
 endif

 ifeq (WINNT,$(OS_TARGET))
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@ -8,7 +8,7 @@ MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =

 ifdef MOZ_NATIVE_BZ2
-LIBS += \
+OS_LIBS += \
  $(MOZ_BZ2_LIBS) \
  $(NULL)
 endif
@ -56,8 +56,8 @@ libs::
 endif

 ifeq ($(OS_ARCH),WINNT)
-EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32)
-EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32)
+OS_LIBS += $(call EXPAND_LIBNAME,crypt32)
+OS_LIBS += $(call EXPAND_LIBNAME,advapi32)
 endif

 CXXFLAGS += $(MOZ_BZ2_CFLAGS)
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@ -2,8 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
+    $(NULL)
+
+OS_LIBS += \
 	$(MOZ_DBUS_GLIB_LIBS) \
 	$(NULL)
                
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@ -2,8 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 		$(NSPR_LIBS) \
+        $(NULL)
+
+OS_LIBS += \
 		$(MOZ_GCONF_LIBS) \
 		$(MOZ_GNOMEVFS_LIBS) \
 		$(GLIB_LIBS) \
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@ -21,7 +21,7 @@ CPPSRCS += $(EXTRACPPSRCS)

 include $(topsrcdir)/config/config.mk

-LIBS		+= \
+EXTRA_LIBS	+= \
 		tmreader.$(OBJ_SUFFIX) \
 		adreader.$(OBJ_SUFFIX) \
 		$(NSPR_LIBS) \
@ -32,12 +32,12 @@ ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= \
 		-I'$(HAVE_BOUTELL_GD)' \
 		$(NULL)
-LIBS		+= \
+OS_LIBS		+= \
 		-lmozz_s \
 		'$(HAVE_BOUTELL_GD)/gd.lib' \
 		$(NULL)
 else
-LIBS		+= \
+OS_LIBS		+= \
 		-lgd \
 		$(NULL)
 endif
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS +=		\
+EXTRA_LIBS +=		\
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/webapprt/gtk/Makefile.in
+++ b/webapprt/gtk/Makefile.in
@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS += \
+OS_LIBS += \
  $(TK_LIBS) \
  $(NULL)

--- a/widget/gtk/mozgtk/gtk2/Makefile.in
+++ b/widget/gtk/mozgtk/gtk2/Makefile.in
@ -15,4 +15,4 @@ else
 no_as_needed = -Wl,--no-as-needed $1 -Wl,--as-needed
 endif

-EXTRA_DSO_LDOPTS += $(filter -L%,$(MOZ_GTK2_LIBS)) $(call no_as_needed,-lgtk-x11-2.0 -lgdk-x11-2.0)
+OS_LIBS += $(filter -L%,$(MOZ_GTK2_LIBS)) $(call no_as_needed,-lgtk-x11-2.0 -lgdk-x11-2.0)
--- a/widget/gtk/mozgtk/gtk3/Makefile.in
+++ b/widget/gtk/mozgtk/gtk3/Makefile.in
@ -14,4 +14,4 @@ else
 no_as_needed = -Wl,--no-as-needed $1 -Wl,--as-needed
 endif

-EXTRA_DSO_LDOPTS += $(filter -L%,$(MOZ_GTK3_LIBS)) $(call no_as_needed,-lgtk-3 -lgdk-3)
+OS_LIBS += $(filter -L%,$(MOZ_GTK3_LIBS)) $(call no_as_needed,-lgtk-3 -lgdk-3)
--- a/widget/xremoteclient/Makefile.in
+++ b/widget/xremoteclient/Makefile.in
@ -23,6 +23,11 @@ CPPSRCS += \
  $(LIBCPPSRCS) \
  $(NULL)

-LIBS            = \
-		$(NSPR_LIBS) \
-		$(XLDFLAGS) $(XLIBS)
+EXTRA_LIBS += \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+OS_LIBS += \
+	$(XLDFLAGS) \
+	$(XLIBS) \
+	$(NULL)
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS		+= \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/xpcom/reflect/xptinfo/tests/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-LIBS		+= \
+EXTRA_LIBS		+= \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@ -3,16 +3,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-# EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
-# from this Makefile. We link against the "dependent glue" and against the
-# frozen XPCOM shared library.
-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 		$(NSPR_LIBS) \
 		$(NULL)

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
--- a/xpcom/sample/program/Makefile.in
+++ b/xpcom/sample/program/Makefile.in
@ -5,7 +5,7 @@

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-LIBS            += \
+OS_LIBS            += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@ -11,13 +11,13 @@ MANIFEST = bug656331.manifest
 MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
 PP_TARGETS += MANIFEST

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
  $(NSPR_LIBS) \
  $(NULL)

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
  $(TK_LIBS) \
  $(NULL)
 endif
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@ -9,13 +9,13 @@ MANIFEST = testcomponent.manifest
 MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
 PP_TARGETS += MANIFEST

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 		$(NSPR_LIBS) \
 		$(NULL)

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@ -9,13 +9,13 @@ MANIFEST = testcompnoaslr.manifest
 MANIFEST_PATH = $(testxpcobjdir)/$(unittestlocation)
 PP_TARGETS += MANIFEST

-EXTRA_DSO_LDOPTS = \
+EXTRA_LIBS += \
 		$(NSPR_LIBS) \
 		$(NULL)

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
+OS_LIBS += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
--- a/xpcom/tests/external/Makefile.in
+++ b/xpcom/tests/external/Makefile.in
@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-include $(topsrcdir)/config/rules.mk
-
-LIBS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ b/xulrunner/examples/simple/components/src/Makefile.in
@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-EXTRA_DSO_LDOPTS += \
+EXTRA_LIBS += \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@ -7,7 +7,7 @@ MOZ_GLUE_LDFLAGS =

 # Need to link with CoreFoundation on Mac
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-LIBS            += \
+OS_LIBS            += \
 		$(TK_LIBS) \
 		$(NULL)
 endif
@ -20,10 +20,6 @@ MOZ_WINCONSOLE = 0
 endif
 endif

-include $(topsrcdir)/config/config.mk
-
-include $(topsrcdir)/config/rules.mk
-
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,shell32)
 endif