diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-01 21:26:28 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-02-01 21:26:28 +0000 |
| commit | 472a0d2057a71b816af9e88c39ceafacc160ad9c (patch) | |
| tree | cf2c8e7a9322fa46f4e2a1977b719400c06cdd91 /pkgs/build-support/gcc-wrapper/add-flags | |
| parent | 15258b7f50a71b092a9cfec99e396b5fb9bb5f4f (diff) | |
| download | nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar.gz nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar.bz2 nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar.lz nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar.xz nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.tar.zst nixpkgs-472a0d2057a71b816af9e88c39ceafacc160ad9c.zip | |
* Pass -rpath flags in the same order as -L flags.
* Put the Glibc linker flags in front of the GCC linker flags. Needed for the stdenv-linux bootstrap. svn path=/nixpkgs/branches/stdenv-updates/; revision=13940
Diffstat (limited to 'pkgs/build-support/gcc-wrapper/add-flags')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/add-flags | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index ace0a789628..02755e44541 100644 --- a/pkgs/build-support/gcc-wrapper/add-flags +++ b/pkgs/build-support/gcc-wrapper/add-flags @@ -5,16 +5,16 @@ if test -e @out@/nix-support/libc-cflags; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" fi -if test -e @out@/nix-support/libc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/libc-ldflags) $NIX_LDFLAGS" -fi - if test -e @out@/nix-support/gcc-cflags; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" fi +if test -e @out@/nix-support/libc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +fi + if test -e @out@/nix-support/gcc-ldflags; then - export NIX_LDFLAGS="$(cat @out@/nix-support/gcc-ldflags) $NIX_LDFLAGS" + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" fi if test -e @out@/nix-support/libc-ldflags-before; then |