summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2016-10-14 16:32:09 +0200
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2016-10-14 16:32:09 +0200
commit44d3245eef6347ff365b096154c026b77a55d395 (patch)
treeefe197e0bf0e4b3654a2d93cc22b24030ab8c239 /Makefile
parent329d62bde687385a6da93e258b21c696475f9a7b (diff)
downloadnss-hg-44d3245eef6347ff365b096154c026b77a55d395.tar.gz
Bug 1310168 - fix mac builds, r=bustage
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 32f822cee..270747e06 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,10 @@ endif
ifdef CCC
NSPR_CONFIGURE_ENV += CXX=$(CCC)
endif
+# Remove -arch definitions. NSPR can't handle that.
+NSPR_CONFIGURE_ENV := $(filter-out -arch x86_64,$(NSPR_CONFIGURE_ENV))
+NSPR_CONFIGURE_ENV := $(filter-out -arch i386,$(NSPR_CONFIGURE_ENV))
+NSPR_CONFIGURE_ENV := $(filter-out -arch ppc,$(NSPR_CONFIGURE_ENV))
ifdef SANITIZER_CFLAGS
ifdef BUILD_OPT