diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-08 11:42:09 +0200 |
| commit | 585983bc954d043d40a14b29c0bddca42bb9cdfb (patch) | |
| tree | f64c271969e6fa21b7e3e49da7653a92f2d6face /pkgs/build-support | |
| parent | ff85b53c5f266a6a7bbcf8b30c4eea7c3f6160ee (diff) | |
| parent | a71744392b6964e624d3ae968bee660731b7d271 (diff) | |
| download | nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.gz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.bz2 nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.lz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.xz nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.tar.zst nixlib-585983bc954d043d40a14b29c0bddca42bb9cdfb.zip | |
Merge remote-tracking branch 'origin/staging'
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index c53fd44207d0..2ad7783a442c 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -77,7 +77,6 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then n=$((n + 1)) done params=("${rest[@]}") - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty" fi |