From a7ee0d3a45d0ecf3686e58f256bf087d57305b1b Mon Sep 17 00:00:00 2001
From: Cameron Kaiser <classilla@floodgap.com>
Date: Thu, 23 Jan 2020 17:54:04 -0800
Subject: [PATCH] #369: add back build system changes

---
 security/nss/coreconf/Darwin.mk | 7 +++++++
 security/nss/coreconf/Werror.mk | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/security/nss/coreconf/Darwin.mk b/security/nss/coreconf/Darwin.mk
index 0569e1819..a22d05f87 100644
--- a/security/nss/coreconf/Darwin.mk
+++ b/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
diff --git a/security/nss/coreconf/Werror.mk b/security/nss/coreconf/Werror.mk
index 3585235cd..375a30046 100644
--- a/security/nss/coreconf/Werror.mk
+++ b/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