diff options
| author | Shea Levy <shea@shealevy.com> | 2015-01-16 11:30:51 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-01-16 11:30:51 -0500 |
| commit | f326b7995c6615e27e75b05dd3c2edff5b61d3b3 (patch) | |
| tree | 1744d3e17d364a93b416a49da0d60991124c168c /pkgs | |
| parent | 7dc57a389e3d3eb5b5e8de3b02dfe469496fad1a (diff) | |
| download | nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar.gz nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar.bz2 nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar.lz nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar.xz nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.tar.zst nixlib-f326b7995c6615e27e75b05dd3c2edff5b61d3b3.zip | |
Remove libc++ stuff from cc-wrapper
This is now part of the libc++ setup hook
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 3a7e24dfcafb..9284a62c643f 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -79,19 +79,6 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then params=("${rest[@]}") fi -if test -n "@libcxx@"; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1" - if [[ "@prog@" = *++ ]]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -stdlib=libc++" - if test -z "$NIX_SKIP_CXX"; then - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++" - fi - if test -z "$NIX_SKIP_CXXABI" && echo "$@" | grep -qvw -- -nostdlib; then - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxxabi@/lib -lc++abi" - fi - fi -fi - # Add the flags for the C compiler proper. extraAfter=($NIX_CFLAGS_COMPILE) extraBefore=() |