From b060076e21257cd46b5bf8e83e1c3efa61187a76 Mon Sep 17 00:00:00 2001 From: Semion Nadezhdin Date: Wed, 13 Jul 2022 21:06:16 +0300 Subject: cc-wrapper: broaden explicit libc++abi linking for LLVM stdenv --- pkgs/build-support/cc-wrapper/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index d74d0490b40..d2af065cde2 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -374,7 +374,6 @@ stdenv.mkDerivation { + optionalString (libcxx.isLLVM or false) ('' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - '' + lib.optionalString stdenv.targetPlatform.isLinux '' echo "-lc++abi" >> $out/nix-support/libcxx-ldflags '') -- cgit 1.4.1