diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 17:49:44 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 17:49:44 +0000 |
| commit | 1550034ac40a680a5947011d84827244c95a67f4 (patch) | |
| tree | d578914e91545a1bd39527bb7f808c58062bfd12 /pkgs/stdenv/generic | |
| parent | 798a009f1db0f930651622e4c8e28835c8d12325 (diff) | |
| download | nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar.gz nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar.bz2 nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar.lz nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar.xz nixlib-1550034ac40a680a5947011d84827244c95a67f4.tar.zst nixlib-1550034ac40a680a5947011d84827244c95a67f4.zip | |
* Various bug fixes in setup.sh and ld-wrapper.sh.
svn path=/nixpkgs/trunk/; revision=909
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 4f1485f224bf..c14c96d8061b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -311,7 +311,6 @@ fixLibtool() { configureW() { if test -n "$configurePhase"; then $configurePhase - stopNest return fi @@ -321,14 +320,13 @@ configureW() { if test -z "$configureScript"; then configureScript=./configure - fi - - if ! test -x $configureScript; then - echo "no configure script, doing nothing" - return + if ! test -x $configureScript; then + echo "no configure script, doing nothing" + return + fi fi - if test -z "$dontFixLibtool" -a -f ./ltmain.sh; then + if test -z "$dontFixLibtool"; then for i in $(find . -name "ltmain.sh"); do echo "fixing libtool script $i" fixLibtool $i |