summaryrefslogtreecommitdiffstats
path: root/security/nss/Makefile
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:46:26 +0100
commitf017b749ea9f1586d2308504553d40bf4cc5439d (patch)
treec6033924a0de9be1ab140596e305898c651bf57e /security/nss/Makefile
parent7c728b3c7680662fc4e92b5d03697b8339560b08 (diff)
downloadUXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.gz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.lz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.xz
UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.zip
Update NSS to 3.32.1-RTM
Diffstat (limited to 'security/nss/Makefile')
-rw-r--r--security/nss/Makefile10
1 files changed, 1 insertions, 9 deletions
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