Skip to content

Commit 5490e58

Browse files
committedDec 5, 2017
v8: Fix aarch64 build
https://hydra.nixos.org/build/65224506 Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was wrong and resulted in "x64" (stdenv.isArm is not true on AArch64).
1 parent c0d7a05 commit 5490e58

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed
 

‎pkgs/development/libraries/v8/default.nix

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
assert readline != null;
88

99
let
10-
arch = if stdenv.isArm
11-
then if stdenv.is64bit
12-
then"arm64"
13-
else "arm"
14-
else if stdenv.is64bit
15-
then"x64"
16-
else "ia32";
10+
arch = if stdenv.isx86_64 then "x64"
11+
else if stdenv.isi686 then "ia32"
12+
else if stdenv.isAarch64 then "arm64"
13+
else if stdenv.isArm then "arm"
14+
else throw "Unknown architecture for v8";
1715
git_url = "https://chromium.googlesource.com";
1816
clangFlag = if stdenv.isDarwin then "1" else "0";
1917
sharedFlag = if static then "static_library" else "shared_library";
@@ -172,6 +170,8 @@ stdenv.mkDerivation rec {
172170

173171
enableParallelBuilding = true;
174172

173+
dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;
174+
175175
# the `libv8_libplatform` target is _only_ built as a static library,
176176
# and is expected to be statically linked in when needed.
177177
# see the following link for further commentary:

0 commit comments

Comments
 (0)
Please sign in to comment.