Bug 1310168 - fix mac builds, r=bustage

sailfishos-mirror · Oct 14, 2016 · a2776c9 · a2776c9
1 parent 2d08483
commit a2776c9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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