From 9917c9705f5363d76ced7cf0feb494aaa25dc94c Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Sun, 27 Oct 2024 12:26:53 +0000 Subject: [PATCH] llvmPackages.clang: Drop CLANG_DEFAULT_CXX_STDLIB This is better handled in the cc-wrapper, and makes it possible to avoid rebuilding clang in some scenarios. It also appears to be unnecessary since the cc-wrapper already passes -stdlib=libc++ where needed. See: https://github.com/NixOS/nixpkgs/blob/8885a1e21ad43f8031c738a08029cd1d4dcbc2f7/pkgs/build-support/cc-wrapper/default.nix#L603 Signed-off-by: Peter Waller --- pkgs/development/compilers/llvm/common/clang/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 5c9662c24d58..45b8090d8214 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -72,9 +72,7 @@ let # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7 "-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen" "-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen" - ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ - "-DCLANG_DEFAULT_CXX_STDLIB=ON" - ] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" + ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm" ++ devExtraCmakeFlags; postPatch = ''