diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-28 19:08:19 +0100 |
| commit | 5be0a9acd7b9abe4bff3202a7ac7defc17a37877 (patch) | |
| tree | 25491a83f604f1ace6a1170505955df5817495c2 /pkgs/development/compilers/gcc/4.6/default.nix | |
| parent | f4ed8a3b911628335a53b3b5ddb48e9ec8d8bdcf (diff) | |
| download | nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.gz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.bz2 nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.lz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.xz nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.tar.zst nixlib-5be0a9acd7b9abe4bff3202a7ac7defc17a37877.zip | |
Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology).
Diffstat (limited to 'pkgs/development/compilers/gcc/4.6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 9a15faeaf1db..ec15b88bb791 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation ({ postPatch = if (stdenv.isGNU - || (libcCross != null # e.g., building `gcc.hostDrv' + || (libcCross != null # e.g., building `gcc.crossDrv' && libcCross ? crossConfig && libcCross.crossConfig == "i586-pc-gnu") || (crossGNU && libcCross != null)) @@ -327,13 +327,13 @@ stdenv.mkDerivation ({ configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""} - ${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""} + ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} + ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""} - --with-gmp=${gmp.hostDrv} - --with-mpfr=${mpfr.hostDrv} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} + --with-gmp=${gmp.crossDrv} + --with-mpfr=${mpfr.crossDrv} --disable-libstdcxx-pch --without-included-gettext --with-system-zlib |