diff options
| author | Pale Moon <git-repo@palemoon.org> | 2017-02-27 16:45:16 +0100 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2017-02-27 16:45:16 +0100 |
| commit | f2179c9d1111eb11d36f7cd7725c7467951c502c (patch) | |
| tree | b91a978de21a68ab82f2274e10dfbd5d9f16938a /config | |
| parent | 115d296d0150cddb50adf01f1bf92bbf0a4d04bd (diff) | |
| parent | d5fe7a90796169048f6877914944ba3c2b288ca0 (diff) | |
| download | palemoon-gre-f2179c9d1111eb11d36f7cd7725c7467951c502c.tar.gz | |
Merge branch 'master' of https://github.com/MoonchildProductions/Pale-Moon
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nss/Makefile.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 2b20695c5..38765d77f 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -268,6 +268,13 @@ DEFAULT_GMAKE_FLAGS += MAKE_OBJDIR='$$(INSTALL) -D $$(OBJDIR)' # it, creating race conditions. See bug #836220 DEFAULT_GMAKE_FLAGS += TARGETS='$$(LIBRARY) $$(SHARED_LIBRARY) $$(PROGRAM)' +ifndef WARNINGS_AS_ERRORS +DEFAULT_GMAKE_FLAGS += NSS_ENABLE_WERROR=0 +endif +ifeq ($(OS_TARGET),Android) +DEFAULT_GMAKE_FLAGS += NSS_ENABLE_WERROR=0 +endif + NSS_SRCDIR = $(topsrcdir) NSS_DIRS = |