summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/julia/0.3.nix12
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}"