diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2017-01-20 14:45:55 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2017-01-20 14:45:55 +0100 |
| commit | 96c42a0951b7aa380168ee2b109fb3e027fdf11b (patch) | |
| tree | d833c46ae50a8b5491a461d02cdbff49bac9e44c /coreconf/nspr.sh | |
| parent | a32a6fb2756f0dfded13e60db61087d97631572a (diff) | |
| download | nss-hg-96c42a0951b7aa380168ee2b109fb3e027fdf11b.tar.gz | |
Bug 1330655 - Make NSS build within OSS-Fuzz r=franziskus
Differential Revision: https://nss-review.dev.mozaws.net/D161
Diffstat (limited to 'coreconf/nspr.sh')
| -rw-r--r-- | coreconf/nspr.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/coreconf/nspr.sh b/coreconf/nspr.sh index 9334dcc6e..15f9f7f7c 100644 --- a/coreconf/nspr.sh +++ b/coreconf/nspr.sh @@ -14,12 +14,11 @@ if hash gmake 2>/dev/null; then make() { command gmake "$@"; } fi -nspr_sanitizer() +nspr_set_flags() { - local extra=$(python $cwd/coreconf/sanitizers.py "$@") - nspr_cflags="$nspr_cflags $extra" - nspr_cxxflags="$nspr_cxxflags $extra" - nspr_ldflags="$nspr_ldflags $extra" + nspr_cflags="$CFLAGS $@" + nspr_cxxflags="$CXXFLAGS $@" + nspr_ldflags="$LDFLAGS $@" } nspr_build() |