diff options
author | Ted Mielczarek <ted@mielczarek.org> | 2016-11-09 14:44:55 -0500 |
---|---|---|
committer | Ted Mielczarek <ted@mielczarek.org> | 2016-11-09 14:44:55 -0500 |
commit | cce2e1116e99f0c1fee35c417402690ef9a4c7b3 (patch) | |
tree | e767b209c420e3bfc664177f9532dd9380dd1072 /build.sh | |
parent | 33931a90dce458374dcff80e82dab7c7f9e9f370 (diff) | |
download | nss-hg-cce2e1116e99f0c1fee35c417402690ef9a4c7b3.tar.gz |
bug 1315231 - Fix build.sh host architecture detection on Windows, explicitly pass nspr_{include,lib}_dir to gyp. r=ttaubert
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -54,6 +54,9 @@ params=$(echo "$* $CC $CCC" | tr " " "\n") cwd=$(cd $(dirname $0); pwd -P) dist_dir="$cwd/../dist" +cwd=$(cd $(dirname $0); pwd -P) +dist_dir="$cwd/../dist" + # try to guess sensible defaults arch=$(python "$cwd/coreconf/detect_host_arch.py") if [ "$arch" = "x64" -o "$arch" = "aarch64" ]; then @@ -161,8 +164,10 @@ if [ "$rebuild_gyp" = 1 -o ! -d "$target_dir" ]; then build_nspr # Run gyp. + set -v -x "${scanbuild[@]}" gyp -f ninja "${gyp_params[@]}" --depth="$cwd" \ --generator-output="." "$cwd/nss.gyp" + set +v +x # Store used parameters for next run. echo "$params" > "$cwd/out/config" |