Merge pull request #13993 from joachifm/julia-git-i686

julia-git: pass march=pentium4 for i686 targets
This commit is contained in:
Robin Gloster 2016-03-17 17:22:34 +01:00
commit 62b28abd5b

View File

@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
makeFlags =
let
arch = head (splitString "-" stdenv.system);
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
march = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
or (throw "unsupported architecture: ${arch}");
# Julia requires Pentium 4 (SSE2) or better
cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"