From 934a460fd2fdd7667fa2928275aa7e0cbcab5feb Mon Sep 17 00:00:00 2001 From: Rhys Date: Fri, 29 Apr 2016 09:00:38 +1000 Subject: [PATCH] v8: Build 3.16.14 on ARM --- pkgs/development/libraries/v8/3.16.14.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index c79357cd907..d9addab3030 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -3,7 +3,10 @@ assert readline != null; let - arch = if stdenv.is64bit then "x64" else "ia32"; + arch = if stdenv.isArm + then (if stdenv.is64bit then "arm64" else "arm") + else (if stdenv.is64bit then "x64" else "ia32"); + armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard"; in stdenv.mkDerivation rec { @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { -Dconsole=readline \ -Dcomponent=shared_library \ -Dv8_target_arch=${arch} \ + ${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \ --depth=. -Ibuild/standalone.gypi \ build/all.gyp '';