From 3e7034abb9490e3eff4ec436317f3d6b5f52b8d7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Dec 2020 16:48:00 -0600 Subject: [PATCH] darwin/xcode: provide libc++ from XCode toolchain We could use our own libc++ here, but it is probably best to use the provided one to ensure consistency. This fixes some C++ programs when running aarch64-apple-ios-clang++. --- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index ab934d7eaaa..0512d9dd46a 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -41,6 +41,7 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags + ${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"} ''; }) // { inherit sdk;