* Toss out all the linker flags, since any --rpath switch causes the
glibc build to fail. svn path=/nixpkgs/trunk/; revision=876
This commit is contained in:
parent
8ed9ea8b51
commit
085e197ea3
@ -4,6 +4,13 @@ export NIX_NO_SELF_RPATH=1
|
|||||||
. $stdenv/setup
|
. $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() {
|
postUnpack() {
|
||||||
cd $sourceRoot
|
cd $sourceRoot
|
||||||
unpackFile $linuxthreadsSrc
|
unpackFile $linuxthreadsSrc
|
||||||
@ -17,7 +24,8 @@ preConfigure() {
|
|||||||
mkdir ../build
|
mkdir ../build
|
||||||
cd ../build
|
cd ../build
|
||||||
configureScript=../$sourceRoot/configure
|
configureScript=../$sourceRoot/configure
|
||||||
configureFlags="--enable-add-ons --disable-profile"
|
configureFlags="--enable-add-ons --disable-profile \
|
||||||
|
--with-headers=$kernelHeaders/include"
|
||||||
}
|
}
|
||||||
|
|
||||||
preConfigure=preConfigure
|
preConfigure=preConfigure
|
||||||
|
Loading…
x
Reference in New Issue
Block a user