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/stdenv | |
| 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/stdenv')
| -rw-r--r-- | nixpkgs/pkgs/stdenv/darwin/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/stdenv/darwin/default.nix b/nixpkgs/pkgs/stdenv/darwin/default.nix index b69de041fd23..9de6ef63bfea 100644 --- a/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -90,11 +90,11 @@ in rec { inherit shell; inherit (last) stdenvNoCC; - extraPackages = lib.optional (libcxx != null) libcxx; + extraPackages = []; nativeTools = false; nativeLibc = false; - inherit buildPackages coreutils gnugrep bintools; + inherit buildPackages coreutils gnugrep bintools libcxx; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "${name}-clang"; outPath = bootstrapTools; }; @@ -168,8 +168,9 @@ in rec { ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; + passthru = { + isLLVM = true; + }; }; libcxxabi = stdenv.mkDerivation { |