diff options
| author | Peter Simons <simons@cryp.to> | 2011-11-02 10:28:32 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-11-02 10:28:32 +0000 |
| commit | 69488d688d18c3b7fe8ed1e18f3fab6c968eae07 (patch) | |
| tree | cca01a305e045e6f60868a924ae2ca140a798f0c /pkgs/build-support | |
| parent | 4d0d7d78c5f116c59cd2736d55a5928981be5dc7 (diff) | |
| parent | c882363fceb87f8f0af915f474bea014475488ea (diff) | |
| download | nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar.gz nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar.bz2 nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar.lz nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar.xz nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.tar.zst nixlib-69488d688d18c3b7fe8ed1e18f3fab6c968eae07.zip | |
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/clang-wrapper/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 2 | ||||
| -rw-r--r-- | pkgs/build-support/nuke-references/builder.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index dc039605d031..fe714a0719a1 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -47,7 +47,7 @@ else # It's unclear if these will ever be provided by an LLVM project clangCFlags="$clangCFlags -B$basePath" - clangCFlags="$clangCFlags -I$clang/lib/clang/$clangVersion/include" + clangCFlags="$clangCFlags -isystem$clang/lib/clang/$clangVersion/include" echo "$clangCFlags" > $out/nix-support/clang-cflags clangPath="$clang/bin" diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 8b244043676c..faf6e92fdff1 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -27,7 +27,7 @@ done echo "closure:" ensureDir $out/lib/modules/"$version" for module in $closure; do - target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^") + target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi if test \! -e "$module"; then continue; fi # XXX: to avoid error with "cp builtin builtin" mkdir -p $(dirname $target) diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 429a5a8dee4e..3b9324073ef8 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -5,7 +5,7 @@ cat > $out/bin/nuke-refs <<EOF #! $SHELL -e for i in \$*; do if test ! -L \$i -a -f \$i; then - cat \$i | sed "s|/nix/store/[a-z0-9]*-|/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp + cat \$i | sed "s|$NIX_STORE/[a-z0-9]*-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > \$i.tmp if test -x \$i; then chmod +x \$i.tmp; fi mv \$i.tmp \$i fi |