nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

julia: fix i686 build

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-09-04 22:22:51 +03:00 committed by Thomas Tuegel
parent e6e338401f
commit 02fc4551f5
1 changed files with 1 additions and 11 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

@ -68,17 +68,7 @@ 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}"