diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/Makefile | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/Makefile')
| -rw-r--r-- | security/nss/Makefile | 10 |
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 |