diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 17:23:18 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-09-18 17:23:18 +0000 |
| commit | 1ab4a9324cf8d7a49027eedbc176926f7325cf7a (patch) | |
| tree | f24b4aedb92b45bc93e22aea08bc0029ce8642a2 /pkgs/stdenv | |
| parent | e31d1dd9604033e0d5af6230e41c2a52d53e9a41 (diff) | |
| download | nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar.gz nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar.bz2 nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar.lz nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar.xz nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.tar.zst nixlib-1ab4a9324cf8d7a49027eedbc176926f7325cf7a.zip | |
* The `patch' command is now part of stdenv, so it no longer needs to
be passed to derivations that need to apply patches. * GCC 3.4 is now the default compiler (old GCC renamed to `gcc-3.3'). * The temporary GCCs built during the stdenvLinux bootstrap are now built without C++ support and without profiling. * Remove fixincl in GCC 3.4 to prevent a retained dependency on the previous GCC. * Always set $prefix in setup.sh, even when there is no configure script. svn path=/nixpkgs/trunk/; revision=1444
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/builder.sh (renamed from pkgs/stdenv/generic-branch/builder.sh) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default-builder.sh (renamed from pkgs/stdenv/generic-branch/default-builder.sh) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix (renamed from pkgs/stdenv/generic-branch/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/docs.txt (renamed from pkgs/stdenv/generic-branch/docs.txt) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh (renamed from pkgs/stdenv/generic-branch/setup.sh) | 16 |
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic-branch/builder.sh b/pkgs/stdenv/generic/builder.sh index bbcd19448cb7..bbcd19448cb7 100644 --- a/pkgs/stdenv/generic-branch/builder.sh +++ b/pkgs/stdenv/generic/builder.sh diff --git a/pkgs/stdenv/generic-branch/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh index 9a297c67f6e8..9a297c67f6e8 100644 --- a/pkgs/stdenv/generic-branch/default-builder.sh +++ b/pkgs/stdenv/generic/default-builder.sh diff --git a/pkgs/stdenv/generic-branch/default.nix b/pkgs/stdenv/generic/default.nix index 3aa2d3bfac07..3aa2d3bfac07 100644 --- a/pkgs/stdenv/generic-branch/default.nix +++ b/pkgs/stdenv/generic/default.nix diff --git a/pkgs/stdenv/generic-branch/docs.txt b/pkgs/stdenv/generic/docs.txt index 060f3cd154b9..060f3cd154b9 100644 --- a/pkgs/stdenv/generic-branch/docs.txt +++ b/pkgs/stdenv/generic/docs.txt diff --git a/pkgs/stdenv/generic-branch/setup.sh b/pkgs/stdenv/generic/setup.sh index 0fcbb5ee1eae..0e2dac944e3c 100644 --- a/pkgs/stdenv/generic-branch/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -424,6 +424,14 @@ configureW() { $preConfigure fi + if test -z "$prefix"; then + prefix="$out"; + fi + + if test "$useTempPrefix" = "1"; then + prefix="$NIX_BUILD_TOP/tmp_prefix"; + fi + if test -z "$configureScript"; then configureScript=./configure if ! test -x $configureScript; then @@ -439,14 +447,6 @@ configureW() { done fi - if test -z "$prefix"; then - prefix="$out"; - fi - - if test "$useTempPrefix" = "1"; then - prefix="$NIX_BUILD_TOP/tmp_prefix"; - fi - if test -z "$dontAddPrefix"; then configureFlags="--prefix=$prefix $configureFlags" fi |