diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-02 21:06:40 +0100 |
| commit | f4a12fc67689a830e9da1c87fd11afe5bc09deb3 (patch) | |
| tree | 211ae0cd022a6c11b0026ecc7761a550c584583c /security/nss/Makefile | |
| parent | f7d30133221896638f7bf4f66c504255c4b14f48 (diff) | |
| download | UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.gz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.lz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.tar.xz UXP-f4a12fc67689a830e9da1c87fd11afe5bc09deb3.zip | |
Issue #1338 - Part 2: Update NSS to 3.48-RTM
Diffstat (limited to 'security/nss/Makefile')
| -rw-r--r-- | security/nss/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 48bae3778..2dc8de112 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -86,16 +86,14 @@ 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=$(CC) +NSPR_CONFIGURE_ENV = CC="$(call remove_arch,$(CC))" endif ifdef CCC -NSPR_CONFIGURE_ENV += CXX=$(CCC) +NSPR_CONFIGURE_ENV += CXX="$(call remove_arch,$(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 @@ -137,6 +135,7 @@ endif build_nspr: $(NSPR_CONFIG_STATUS) $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) + $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests install_nspr: build_nspr $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install @@ -157,4 +156,3 @@ package: latest: echo $(OBJDIR_NAME) > $(CORE_DEPTH)/../dist/latest - |