JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v8: Fix aarch64 build

Browse Source 
https://hydra.nixos.org/build/65224506

Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was
wrong and resulted in "x64" (stdenv.isArm is not true on AArch64).
This commit is contained in:
Tuomas Tynkkynen 2017-12-05 03:43:07 +02:00
parent c0d7a054cb
commit 5490e580f5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/v8/default.nix
View File

@ -7,13 +7,11 @@
assert readline != null;
let
arch = if stdenv.isArm
then if stdenv.is64bit
then"arm64"
else "arm"
else if stdenv.is64bit
then"x64"
else "ia32";
arch = if stdenv.isx86_64 then "x64"
else if stdenv.isi686 then "ia32"
else if stdenv.isAarch64 then "arm64"
else if stdenv.isArm then "arm"
else throw "Unknown architecture for v8";
git_url = "https://chromium.googlesource.com";
clangFlag = if stdenv.isDarwin then "1" else "0";
sharedFlag = if static then "static_library" else "shared_library";
@ -172,6 +170,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;
# the `libv8_libplatform` target is _only_ built as a static library,
# and is expected to be statically linked in when needed.
# see the following link for further commentary: