From b62baacbc177cf799d88c2b519015a13ef91891c Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Mon, 29 Jun 2015 13:55:12 -0700 Subject: [PATCH] Revert "Fix libcxxStdenv on Linux" This reverts commit 172ed10426df966ee5df76a1ef18f683698fe23f. --- pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++++-- pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh index 62ab46ac310..8a45be7e85a 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh @@ -1,2 +1,4 @@ -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi" +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++" diff --git a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh index 62ab46ac310..8a45be7e85a 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh @@ -1,2 +1,4 @@ -export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi" +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5875abfaa4b..afcda331b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3597,7 +3597,7 @@ let libc = glibc; binutils = binutils; inherit coreutils zlib; - extraPackages = [ libcxx libcxxabi ]; + extraPackages = [ libcxx ]; nativeTools = false; nativeLibc = false; };