* Various bug fixes in setup.sh and ld-wrapper.sh.

svn path=/nixpkgs/trunk/; revision=909

5 files changed, 13 insertions, 28 deletions

diff --git a/pkgs/TODO b/pkgs/TODO
index 63ec0c9c47dbf..608e8bf6284d7 100644
--- a/pkgs/TODO
+++ b/pkgs/TODO
@@ -1,18 +1,9 @@
 * Bump freetype to 2.1.7 (but it breaks Pango 1.2.5).
 
-* In setup.sh, remove " -a -f ./ltmain.sh" (and then remove ltmain stuff from Subversion)
-
 * Patch development/tools/misc/libtool not to search standard
   directories for libraries (like setup.sh does now). [do we want
   this?]
 
-* Bug in ld-wrapper: should source in add-flags (like gcc-wrapper) - then fix uml builder
-
-* In setup.sh: move "test -x $configureScript" into "if test -z $configureScript..."
-
-* In setup.sh: remove bogus stopNest in configureW
-
 * In setup.sh: add configureFlagsArray or something
 
-
 * Inform freedesktop people that Xaw requires Xpm.
\ No newline at end of file
diff --git a/pkgs/applications/version-management/subversion/builder.sh b/pkgs/applications/version-management/subversion/builder.sh
index 8888241429b1a..8dd5e6fb2e44e 100644
--- a/pkgs/applications/version-management/subversion/builder.sh
+++ b/pkgs/applications/version-management/subversion/builder.sh
@@ -23,15 +23,6 @@ fi
 installFlags="$makeFlags"
 
 
-preConfigure() {
-    for i in $(find . -name "ltmain.sh"); do
-        echo "fixing libtool script $i"
-        fixLibtool $i
-    done
-}
-preConfigure=preConfigure
-
-
 postInstall() {
     if test "$swigBindings"; then
         make swig-py
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index a6a4c3f7253cb..96d1bfc6be74d 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -68,9 +68,10 @@ test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
 test -n "$glibc" && echo $glibc > $out/nix-support/orig-glibc
 
 cat > $out/nix-support/add-flags <<EOF
-NIX_CFLAGS_COMPILE="$cflagsCompile \$NIX_CFLAGS_COMPILE"
-NIX_CFLAGS_LINK="$cflagsLink \$NIX_CFLAGS_LINK"
-NIX_LDFLAGS="$ldflags \$NIX_LDFLAGS"
+export NIX_CFLAGS_COMPILE="$cflagsCompile \$NIX_CFLAGS_COMPILE"
+export NIX_CFLAGS_LINK="$cflagsLink \$NIX_CFLAGS_LINK"
+export NIX_LDFLAGS="$ldflags \$NIX_LDFLAGS"
+export NIX_GLIBC_FLAGS_SET=1
 EOF
 
 sed \
diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index 3196a93224643..1bfc86d5c6c31 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -4,6 +4,10 @@ if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
     . "$NIX_LD_WRAPPER_START_HOOK"
 fi
 
+if test -z "$NIX_GLIBC_FLAGS_SET"; then
+    . @out@/nix-support/add-flags
+fi
+
 . @out@/nix-support/utils
 
 
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4f1485f224bf7..c14c96d8061b6 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