diff options
| author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-04-13 11:58:51 +0200 |
|---|---|---|
| committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-04-13 11:58:51 +0200 |
| commit | e59fcec44e241bea744c88d2d1f8cbeed0f01393 (patch) | |
| tree | 627f713091aa1188756dec3a129340f6020f3819 /build.sh | |
| parent | 8ef117b17a1dfe2c0ed7697310e892488742f5e2 (diff) | |
| download | nss-hg-e59fcec44e241bea744c88d2d1f8cbeed0f01393.tar.gz | |
Bug 1356191 - better platform detection for gyp, r=mt
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -49,6 +49,7 @@ fuzz=0 fuzz_tls=0 fuzz_oss=0 no_local_nspr=0 +armhf=0 gyp_params=(--depth="$cwd" --generator-output=".") nspr_params=() @@ -58,6 +59,8 @@ ninja_params=() arch=$(python "$cwd"/coreconf/detect_host_arch.py) if [ "$arch" = "x64" -o "$arch" = "aarch64" ]; then build_64=1 +elif [ "$arch" = "arm" ]; then + armhf=1 fi # parse command line arguments @@ -101,7 +104,7 @@ else fi if [ "$build_64" = 1 ]; then nspr_params+=(--enable-64bit) -else +elif [ ! "$armhf" = 1 ]; then gyp_params+=(-Dtarget_arch=ia32) fi if [ "$fuzz" = 1 ]; then |