Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/trunk/; revision=909
This commit is contained in:
Eelco Dolstra
2004-04-02 17:49:44 +00:00
parent 798a009f1d
commit 1550034ac4
5 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/gcc-wrapper/builder.sh
View File

@@ -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 \

4
pkgs/build-support/gcc-wrapper/ld-wrapper.sh
View File

@@ -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