Unverified Commit 4d950563 authored by tomberek's avatar tomberek Committed by GitHub
Browse files

Merge pull request #304141 from ExpidusOS/feat/llvm-git-2024-04-14 

llvmPackages_git: update to 19.0.0-unstable-2024-06-12
parents e6cea36f 0621f244

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

+2 −0
Original line number Diff line number Diff line
@@ -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

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

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

pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch

+10 −10
Original line number Diff line number Diff line 
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

index 75b0080f6715..c895b884cd27 100644

index 75b0080f6..c895b884c 100644

--- a/cmake/modules/AddClang.cmake

+++ b/cmake/modules/AddClang.cmake

@@ -119,8 +119,8 @@ macro(add_clang_library name)
@@ -14,22 +14,22 @@ index 75b0080f6715..c895b884cd27 100644 
 

         if (NOT LLVM_ENABLE_IDE)

diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt

index f2b0c5cddcbb..52f37fc368ce 100644

index e6ae4e19e..5ef01aea2 100644

--- a/lib/Headers/CMakeLists.txt

+++ b/lib/Headers/CMakeLists.txt

@@ -473,6 +473,7 @@ add_header_target("windows-resource-headers" ${windows_only_files})

 add_header_target("utility-resource-headers" ${utility_files})

@@ -337,6 +337,7 @@ set(llvm_libc_wrapper_files

 

 get_clang_resource_dir(header_install_dir SUBDIR include)

 include(GetClangResourceDir)

 get_clang_resource_dir(output_dir PREFIX ${LLVM_LIBRARY_OUTPUT_INTDIR}/.. SUBDIR include)

+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)

 set(out_files)

 set(generated_files)

 

 #############################################################

 # Install rules for the catch-all clang-resource-headers target

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt

index 4f23065a2472..6a0f55991e24 100644

index b5b6d2807..6b592d255 100644

--- a/tools/libclang/CMakeLists.txt

+++ b/tools/libclang/CMakeLists.txt

@@ -234,7 +234,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

@@ -246,7 +246,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})

           COMPONENT

             libclang-python-bindings

           DESTINATION
@@ -39,7 +39,7 @@ index 4f23065a2472..6a0f55991e24 100644 
 if(NOT LLVM_ENABLE_IDE)

   add_custom_target(libclang-python-bindings)

diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt

index 3aca22c0b0a8..3115353e3fe3 100644

index 3aca22c0b..3115353e3 100644

--- a/tools/scan-build-py/CMakeLists.txt

+++ b/tools/scan-build-py/CMakeLists.txt

@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})

pkgs/development/compilers/llvm/git/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
# LLVM release information; specify one of these but not both:

, gitRelease ? {

    version = "19.0.0-git";

    rev = "cebf77fb936a7270c7e3fa5c4a7e76216321d385";

    rev-version = "19.0.0-unstable-2024-04-07";

    sha256 = "sha256-616tscgsiFgHQcXW4KzK5srrudYizQFnJVM6K0qRf+I=";

    rev = "78ee473784e5ef6f0b19ce4cb111fb6e4d23c6b2";

    rev-version = "19.0.0-unstable-2024-06-12";

    sha256 = "sha256-oLVMwWjo6Nt8ZsTnDTfoiM5U0+1lVIc1NO+4qBNYlzs=";

}

  # i.e.:

  # {