#369: add back build system changes

security/nss/coreconf/Darwin.mk

@@ -104,6 +104,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

security/nss/coreconf/Werror.mk

@@ -88,9 +88,10 @@ ifndef WARNING_CFLAGS
             NSS_ENABLE_WERROR = 1
           endif
         endif
+	# Our TenFourFox mozconfigs whack NSS here, so just assume WERROR.
+	NSS_ENABLE_WERROR = 1
         ifndef NSS_ENABLE_WERROR
-          # shut up!
-          # $(warning Unable to find gcc 4.8 or greater, disabling -Werror)
+          $(warning Unable to find gcc 4.8 or greater, disabling -Werror)
           NSS_ENABLE_WERROR = 0
         endif
       endif