diff -urN nss-3.14.3/mozilla/security/nss/cmd/lowhashtest/Makefile nss-3.14.3.new/mozilla/security/nss/cmd/lowhashtest/Makefile
--- nss-3.14.3/mozilla/security/nss/cmd/lowhashtest/Makefile	2013-02-23 15:23:39.400700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/cmd/lowhashtest/Makefile	2013-02-23 15:29:14.041705569 +0100
@@ -52,7 +52,7 @@
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
 	-lfreebl3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/cmd/pk11mode/Makefile nss-3.14.3.new/mozilla/security/nss/cmd/pk11mode/Makefile
--- nss-3.14.3/mozilla/security/nss/cmd/pk11mode/Makefile	2013-02-23 15:23:39.419700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/cmd/pk11mode/Makefile	2013-02-23 15:29:16.061705599 +0100
@@ -37,7 +37,7 @@
 else
 
 EXTRA_SHARED_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/cmd/platlibs.mk nss-3.14.3.new/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.14.3/mozilla/security/nss/cmd/platlibs.mk	2013-02-23 15:23:39.420700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/cmd/platlibs.mk	2013-02-23 15:29:16.215705601 +0100
@@ -126,7 +126,7 @@
 	-l$(SQLITE_LIB_NAME) \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -178,7 +178,7 @@
 	-lnss3 \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/cmd/shlibsign/Makefile nss-3.14.3.new/mozilla/security/nss/cmd/shlibsign/Makefile
--- nss-3.14.3/mozilla/security/nss/cmd/shlibsign/Makefile	2013-02-23 15:23:39.419700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/cmd/shlibsign/Makefile	2013-02-23 15:29:16.041705599 +0100
@@ -35,7 +35,7 @@
 else
 
 EXTRA_SHARED_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/cmd/shlibsign/mangle/Makefile nss-3.14.3.new/mozilla/security/nss/cmd/shlibsign/mangle/Makefile
--- nss-3.14.3/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2013-02-23 15:23:39.419700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2013-02-23 15:29:16.052705599 +0100
@@ -35,7 +35,7 @@
 else
 
 EXTRA_SHARED_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.14.3.new/mozilla/security/nss/lib/ckfw/builtins/Makefile
--- nss-3.14.3/mozilla/security/nss/lib/ckfw/builtins/Makefile	2013-02-23 15:23:39.395700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/ckfw/builtins/Makefile	2013-02-23 15:29:13.635705563 +0100
@@ -18,7 +18,7 @@
 
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -33,7 +33,7 @@
 else
 
 EXTRA_SHARED_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/ckfw/capi/Makefile nss-3.14.3.new/mozilla/security/nss/lib/ckfw/capi/Makefile
--- nss-3.14.3/mozilla/security/nss/lib/ckfw/capi/Makefile	2013-02-23 15:23:39.393700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/ckfw/capi/Makefile	2013-02-23 15:29:13.416705560 +0100
@@ -18,7 +18,7 @@
 
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -39,7 +39,7 @@
 else
 
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/ckfw/nssmkey/Makefile nss-3.14.3.new/mozilla/security/nss/lib/ckfw/nssmkey/Makefile
--- nss-3.14.3/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2013-02-23 15:23:39.394700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/ckfw/nssmkey/Makefile	2013-02-23 15:29:13.521705561 +0100
@@ -19,7 +19,7 @@
 
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -34,7 +34,7 @@
 else
 
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/ckfw/pem/Makefile nss-3.14.3.new/mozilla/security/nss/lib/ckfw/pem/Makefile
--- nss-3.14.3/mozilla/security/nss/lib/ckfw/pem/Makefile	2013-02-23 15:23:39.392700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/ckfw/pem/Makefile	2013-02-23 15:29:13.357705559 +0100
@@ -52,7 +52,7 @@
 
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -70,7 +70,7 @@
 else
 
 EXTRA_LIBS += \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/freebl/config.mk nss-3.14.3.new/mozilla/security/nss/lib/freebl/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/freebl/config.mk	2013-02-23 15:23:39.366700579 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/freebl/config.mk	2013-02-23 15:29:10.780705520 +0100
@@ -64,7 +64,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lnspr4 \
 	$(NULL)
 else # ! NS_USE_GCC
@@ -84,7 +84,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lnspr4 \
 	$(NULL)
 endif
diff -urN nss-3.14.3/mozilla/security/nss/lib/nss/config.mk nss-3.14.3.new/mozilla/security/nss/lib/nss/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/nss/config.mk	2013-02-23 15:23:39.391700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/nss/config.mk	2013-02-23 15:29:13.264705557 +0100
@@ -18,7 +18,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4\
@@ -40,7 +40,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/smime/config.mk nss-3.14.3.new/mozilla/security/nss/lib/smime/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/smime/config.mk	2013-02-23 15:23:39.375700579 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/smime/config.mk	2013-02-23 15:29:11.631705533 +0100
@@ -20,7 +20,7 @@
 	-lnss3 \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -42,7 +42,7 @@
 	-lnss3 \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/softoken/config.mk nss-3.14.3.new/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/softoken/config.mk	2013-02-23 15:23:39.388700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/softoken/config.mk	2013-02-23 15:29:12.932705553 +0100
@@ -26,7 +26,7 @@
 	-l$(SQLITE_LIB_NAME) \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -51,7 +51,7 @@
 	-l$(SQLITE_LIB_NAME) \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.14.3.new/mozilla/security/nss/lib/softoken/legacydb/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/softoken/legacydb/config.mk	2013-02-23 15:23:39.388700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/softoken/legacydb/config.mk	2013-02-23 15:29:12.977705553 +0100
@@ -26,7 +26,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -49,7 +49,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/ssl/config.mk nss-3.14.3.new/mozilla/security/nss/lib/ssl/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/ssl/config.mk	2013-02-23 15:23:39.361700579 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/ssl/config.mk	2013-02-23 15:29:10.291705513 +0100
@@ -36,7 +36,7 @@
 	-lnss3 \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -59,7 +59,7 @@
 	-lnss3 \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/sysinit/config.mk nss-3.14.3.new/mozilla/security/nss/lib/sysinit/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/sysinit/config.mk	2013-02-23 15:23:39.363700579 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/sysinit/config.mk	2013-02-23 15:29:10.499705516 +0100
@@ -23,7 +23,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4\
@@ -45,7 +45,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
diff -urN nss-3.14.3/mozilla/security/nss/lib/util/config.mk nss-3.14.3.new/mozilla/security/nss/lib/util/config.mk
--- nss-3.14.3/mozilla/security/nss/lib/util/config.mk	2013-02-23 15:23:39.377700580 +0100
+++ nss-3.14.3.new/mozilla/security/nss/lib/util/config.mk	2013-02-23 15:29:11.863705537 +0100
@@ -16,7 +16,7 @@
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4\
@@ -35,7 +35,7 @@
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
-	-L$(NSPR_LIB_DIR) \
+	-L$(NSPR_LIB_DIR) $(NSPR_LIB_DIR_FLAGS) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \