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

Revert "julia: fix i686 build"

Browse Source 
This reverts commit 02fc4551f5d1eeb657cddea4658eb4212518311c.
This commit is contained in:
Thomas Tuegel 2015-09-18 11:29:26 -05:00
parent b7319c79a6
commit 1c40404cb2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/julia/0.3.nix
View File

@ -79,7 +79,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ]; nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
makeFlags = 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)"
"prefix=$(out)" "prefix=$(out)"
"SHELL=${stdenv.shell}" "SHELL=${stdenv.shell}"