diff options
| -rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -86,14 +86,16 @@ endif ifdef NS_USE_GCC NSPR_CONFIGURE_ENV = CC=gcc CXX=g++ endif -# Make sure to remove -arch arguments. NSPR can't handle that. -remove_arch = $(filter-out __REMOVEME%,$(subst $(NULL) -arch , __REMOVEME,$(1))) ifdef CC -NSPR_CONFIGURE_ENV = CC="$(call remove_arch,$(CC))" +NSPR_CONFIGURE_ENV = CC="$(CC)" endif ifdef CCC -NSPR_CONFIGURE_ENV += CXX="$(call remove_arch,$(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)) # # Some pwd commands on Windows (for example, the pwd @@ -155,3 +157,4 @@ package: latest: echo $(OBJDIR_NAME) > $(CORE_DEPTH)/../dist/latest + |