update NSS as-of pm27 rev 7606140ee

security/nss/coreconf/Darwin.mk

@@ -88,11 +88,14 @@ endif
 OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
 
 ifdef BUILD_OPT
-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
-	OPTIMIZER       = -Oz
-else
-	OPTIMIZER	= -O2
-endif
+
+# TenFourFox overrides optimization settings; let it.
+#ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
+#	OPTIMIZER       = -Oz
+#else
+#	OPTIMIZER	= -O2
+#endif
+
 ifdef MOZ_DEBUG_SYMBOLS
 	ifdef MOZ_DEBUG_FLAGS
 		OPTIMIZER += $(MOZ_DEBUG_FLAGS)
@@ -104,6 +107,13 @@ endif
 
 ARCH		= darwin
 
+#fix missing libmozglue.dylib on TenFourFox Intel build
+ifeq ($(CPU_ARCH), x86)
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/bin \
+	$(NULL)
+endif
+
 DSO_CFLAGS	= -fPIC
 # May override this with different compatibility and current version numbers.
 DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1