diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-16 00:15:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-16 00:15:12 +0000 |
| commit | 7b8f253d6599933d883ea91c1dcfc1d3e3f60628 (patch) | |
| tree | 5aa93d00225161abe76b0bff0e5c6af1129d88f3 /pkgs/development/compilers/llvm/common | |
| parent | 7070f7baf75ce6a10aa215f0b5c1957482659d5a (diff) | |
| parent | 242522b8fed8d63f262fd6e747ba1e4372b59a8e (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/compilers/llvm/common')
| -rw-r--r-- | pkgs/development/compilers/llvm/common/clang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/common/llvm/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 87234dfe7f172..e597ec4d604b1 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -93,6 +93,8 @@ let mkdir -p $lib/lib/clang mv $lib/lib/17 $lib/lib/clang/17 + '') + (lib.optionalString (lib.versionAtLeast release_version "19") '' + mv $out/lib/clang $lib/lib/clang '') + '' # Move libclang to 'lib' output diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 3decc70bb69ac..89ea8f6e7a564 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -210,7 +210,7 @@ stdenv.mkDerivation (rec { '') + # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). - '' + lib.optionalString (lib.versionOlder release_version "19") '' rm test/tools/dsymutil/ARM/obfuscated.test '')) + # FileSystem permissions tests fail with various special bits |