From f326b7995c6615e27e75b05dd3c2edff5b61d3b3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Jan 2015 11:30:51 -0500 Subject: [PATCH] Remove libc++ stuff from cc-wrapper This is now part of the libc++ setup hook --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 13 ------------- 1 file changed, 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=()