From 085e197ea34e80cd7f3b6c37e603525b7f76a059 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Mar 2004 12:35:31 +0000
Subject: [PATCH] * Toss out all the linker flags, since any --rpath switch
 causes the   glibc build to fail.

svn path=/nixpkgs/trunk/; revision=876
---
 pkgs/development/libraries/glibc/builder.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index 398820c00383..23fac6ab9b75 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -4,6 +4,13 @@ export NIX_NO_SELF_RPATH=1
 . $stdenv/setup
 
 
+# !!! Toss the linker flags.  Any sort of rpath is fatal.
+# This probably will cause a failure when building in a pure Nix
+# environment.
+export NIX_LDFLAGS=
+export NIX_GLIBC_FLAGS_SET=1
+
+
 postUnpack() {
     cd $sourceRoot
     unpackFile $linuxthreadsSrc
@@ -17,7 +24,8 @@ preConfigure() {
     mkdir ../build
     cd ../build
     configureScript=../$sourceRoot/configure
-    configureFlags="--enable-add-ons --disable-profile"
+    configureFlags="--enable-add-ons --disable-profile \
+      --with-headers=$kernelHeaders/include"
 }
 
 preConfigure=preConfigure