diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-12 22:12:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 22:12:15 +0200 |
| commit | 1c4b46fcb8bfdba813cc0c885bcd79581dbd409b (patch) | |
| tree | 689bd626506d0b20ab82810e5a9bbfabe059b77c /pkgs/development/compilers/llvm | |
| parent | 8800848e902de50c4930ce4f134773c807259b23 (diff) | |
| parent | e9c656afe4cf5aff1f37c9e10ae21bbcae497188 (diff) | |
Merge pull request #302489 from ExpidusOS/feat/llvm-git-2024-04-07
llvmPackages_git: update to 19.0.0-unstable-2024-04-07
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/git/compiler-rt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/git/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/git/llvm/default.nix | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index f51316beb5705..606ae2868893d 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -81,6 +81,8 @@ stdenv.mkDerivation { # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 "-DCOMPILER_RT_ENABLE_IOS=OFF" + ] ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + "-DSANITIZER_MIN_OSX_VERSION=10.10" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index bd21a75b8c2fc..06da0b3b6a3c6 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -19,9 +19,9 @@ # LLVM release information; specify one of these but not both: , gitRelease ? { version = "19.0.0-git"; - rev = "65058a8d732c3c41664a4dad1a1ae2a504d5c98e"; - rev-version = "19.0.0-unstable-2024-03-16"; - sha256 = "sha256-xV33kx/8OZ2KLtaz25RmudDrlIX7nScauTykf87jyTE="; + rev = "cebf77fb936a7270c7e3fa5c4a7e76216321d385"; + rev-version = "19.0.0-unstable-2024-04-07"; + sha256 = "sha256-616tscgsiFgHQcXW4KzK5srrudYizQFnJVM6K0qRf+I="; } # i.e.: # { diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 670171a707f9c..a9987ab2426d2 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -214,10 +214,6 @@ stdenv.mkDerivation (rec { # TODO(@rrbutani): fix/follow-up substituteInPlace unittests/TargetParser/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - - # This test fails with a `dysmutil` crash; have not yet dug into what's - # going on here (TODO(@rrbutani)). - rm test/tools/dsymutil/ARM/obfuscated.test '' + '' # FileSystem permissions tests fail with various special bits substituteInPlace unittests/Support/CMakeLists.txt \ |