diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-18 11:29:26 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-18 11:29:26 -0500 |
| commit | 1c40404cb2262b92dde025bfb79e4578c68a00eb (patch) | |
| tree | bb69941a4146f18a5a67a121d6b48c0cdbbe1128 /pkgs/development/compilers/julia | |
| parent | b7319c79a625a4e3fb08ce87fa599ad6a9f9c5af (diff) | |
| download | nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar.gz nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar.bz2 nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar.lz nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar.xz nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.tar.zst nixlib-1c40404cb2262b92dde025bfb79e4578c68a00eb.zip | |
Revert "julia: fix i686 build"
This reverts commit 02fc4551f5d1eeb657cddea4658eb4212518311c.
Diffstat (limited to 'pkgs/development/compilers/julia')
| -rw-r--r-- | pkgs/development/compilers/julia/0.3.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 82b35e2b9b36..7d789362e475 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -79,7 +79,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ]; makeFlags = - [ + let + arch = head (splitString "-" stdenv.system); + march = + { "x86_64-linux" = "x86-64"; + "x86_64-darwin" = "x86-64"; + "i686-linux" = "i686"; + }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${march}" "PREFIX=$(out)" "prefix=$(out)" "SHELL=${stdenv.shell}" |