From f017b749ea9f1586d2308504553d40bf4cc5439d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 6 Feb 2018 11:46:26 +0100 Subject: Update NSS to 3.32.1-RTM --- security/nss/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'security/nss/Makefile') diff --git a/security/nss/Makefile b/security/nss/Makefile index c824ba245..48bae3778 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -28,6 +28,7 @@ include $(CORE_DEPTH)/coreconf/config.mk ifdef NSS_DISABLE_GTESTS DIRS := $(filter-out gtests,$(DIRS)) +DIRS := $(filter-out cpputil,$(DIRS)) endif ####################################################################### @@ -96,15 +97,6 @@ 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 -NSPR_CONFIGURE_OPTS += --enable-debug-symbols -endif -NSPR_CONFIGURE_ENV += CFLAGS='$(SANITIZER_CFLAGS)' \ - CXXFLAGS='$(SANITIZER_CFLAGS)' \ - LDFLAGS='$(SANITIZER_LDFLAGS)' -endif - # # Some pwd commands on Windows (for example, the pwd # command in Cygwin) return a pathname that begins -- cgit v1.2.3