From 07f603f89ee2a3258f75964e3d7f004f8dcca972 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Sep 2014 16:39:36 +0200 Subject: [PATCH] libc++: Use the right libc++abi re-export list Also, remove the explicit -lc++abi flag from clang-wrapper. It's not needed because libc++ re-exports the necessary symbols from libc++abi. --- pkgs/build-support/clang-wrapper/clang-wrapper.sh | 2 +- pkgs/development/libraries/libc++/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/clang-wrapper/clang-wrapper.sh b/pkgs/build-support/clang-wrapper/clang-wrapper.sh index 3c6a9c8e452..bad257fd9b0 100644 --- a/pkgs/build-support/clang-wrapper/clang-wrapper.sh +++ b/pkgs/build-support/clang-wrapper/clang-wrapper.sh @@ -81,7 +81,7 @@ fi if test -n "@libcxx@"; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++" - NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib -lc++abi" + NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib" fi # Add the flags for the C compiler proper. diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index e956b1877c6..71705d47d12 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { [ "-DCMAKE_BUILD_TYPE=Release" "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" ];