julia03: use system LLVM
It should be safe to use the Nixpkgs LLVM again, now that the approriate patches have been backported. Hopefully, this will also fix the i686 build.
This commit is contained in:
parent
4a8fbb789a
commit
1daa0b39f6
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||||
md5 = "cb61be3be7254eae39684612c524740d";
|
md5 = "cb61be3be7254eae39684612c524740d";
|
||||||
};
|
};
|
||||||
|
|
||||||
in [ dsfmt_src llvm.src ];
|
in [ dsfmt_src ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
copy_kill_hash(){
|
copy_kill_hash(){
|
||||||
|
@ -70,22 +70,18 @@ stdenv.mkDerivation rec {
|
||||||
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
|
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[ libunwind readline utf8proc zlib
|
arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
|
||||||
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
|
llvm mpfr pcre openblas readline suitesparse utf8proc zlib
|
||||||
openblas arpack suitesparse
|
];
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
|
nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
let
|
let
|
||||||
arch = head (splitString "-" stdenv.system);
|
arch = head (splitString "-" stdenv.system);
|
||||||
march =
|
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
|
||||||
{ "x86_64-linux" = "x86-64";
|
or (throw "unsupported architecture: ${arch}");
|
||||||
"x86_64-darwin" = "x86-64";
|
|
||||||
"i686-linux" = "i686";
|
|
||||||
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
|
|
||||||
in [
|
in [
|
||||||
"ARCH=${arch}"
|
"ARCH=${arch}"
|
||||||
"MARCH=${march}"
|
"MARCH=${march}"
|
||||||
|
@ -108,6 +104,7 @@ stdenv.mkDerivation rec {
|
||||||
"USE_SYSTEM_GMP=1"
|
"USE_SYSTEM_GMP=1"
|
||||||
"USE_SYSTEM_GRISU=1"
|
"USE_SYSTEM_GRISU=1"
|
||||||
"USE_SYSTEM_LIBUNWIND=1"
|
"USE_SYSTEM_LIBUNWIND=1"
|
||||||
|
"USE_SYSTEM_LLVM=1"
|
||||||
"USE_SYSTEM_MPFR=1"
|
"USE_SYSTEM_MPFR=1"
|
||||||
"USE_SYSTEM_PATCHELF=1"
|
"USE_SYSTEM_PATCHELF=1"
|
||||||
"USE_SYSTEM_PCRE=1"
|
"USE_SYSTEM_PCRE=1"
|
||||||
|
|
Loading…
Reference in a new issue