From 3a423e4405adfc5a2266455fabc6a37cf49ccfcd Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 17 Feb 2015 22:39:31 -0500 Subject: [PATCH] It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools --- pkgs/development/compilers/llvm/3.5/libc++/default.nix | 2 -- pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 460d71922c60..d2796d678d03 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - inherit libcxxabi; - setupHook = ./setup-hook.sh; meta = { 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 8543d09d8f52..8a45be7e85a2 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_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1 -stdlib=libc++" -export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,@libcxxabi@/lib" +export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1" + +export NIX_CXXSTDLIB_COMPILE=" -stdlib=libc++" +export NIX_CXXSTDLIB_LINK=" -stdlib=libc++"