diff options
| author | John Ericson <git@JohnEricson.me> | 2020-04-13 20:44:43 -0400 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:16 +0000 |
| commit | 41c637e4b3b17f19b6ce705bdb755e8f98eabb0b (patch) | |
| tree | be6af446196d0a10e3770aba8e1b7a13191e774d /nixpkgs/pkgs/development/compilers/llvm/7/libc++ | |
| parent | 1949213e7997ac860af25d47f846e8b3cb6ecc09 (diff) | |
| download | nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.gz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.bz2 nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.lz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.xz nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.tar.zst nixlib-41c637e4b3b17f19b6ce705bdb755e8f98eabb0b.zip | |
C++ Compilers: Systematize handling of standard libraries
(cherry picked from commit f3f7612a409e4ebbec634ab7f20e094f206d396a)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/7/libc++')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index 96cb671fa431..83c05cf0e634 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" |