Commit 9917c970 authored by Peter Waller's avatar Peter Waller
Browse files

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: default avatarPeter Waller <p@pwaller.net>
parent 4b192e6f

pkgs/development/compilers/llvm/common/clang/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 = ''