gfortran: Attempt to use Apple's GCC on Darwin.
svn path=/nixpkgs/trunk/; revision=33465
This commit is contained in:
parent
076946d277
commit
a2c6280413
@ -1942,17 +1942,26 @@ let
|
|||||||
})));
|
})));
|
||||||
|
|
||||||
gccApple =
|
gccApple =
|
||||||
wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) {
|
wrapGCC (makeOverridable
|
||||||
inherit fetchurl stdenv noSysDirs;
|
(if stdenv.system == "i686-darwin"
|
||||||
profiledCompiler = true;
|
then import ../development/compilers/gcc/4.2-apple32
|
||||||
});
|
else import ../development/compilers/gcc/4.2-apple64) {
|
||||||
|
inherit fetchurl stdenv noSysDirs;
|
||||||
|
profiledCompiler = true;
|
||||||
|
});
|
||||||
|
|
||||||
gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
|
gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
|
||||||
inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
|
inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
|
||||||
texinfo = texinfo49;
|
texinfo = texinfo49;
|
||||||
});
|
});
|
||||||
|
|
||||||
gfortran = gfortran46;
|
gfortran =
|
||||||
|
if stdenv.isDarwin
|
||||||
|
then wrapGCC (gccApple.gcc.override {
|
||||||
|
langF77 = true;
|
||||||
|
inherit gmp mpfr bison flex;
|
||||||
|
})
|
||||||
|
else gfortran46;
|
||||||
|
|
||||||
gfortran40 = wrapGCC (gcc40.gcc.override {
|
gfortran40 = wrapGCC (gcc40.gcc.override {
|
||||||
langFortran = true;
|
langFortran = true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user