Unverified Commit 453e5b9c authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

llvmPackages_git: 20.0.0-git-2024-08-25 -> 20.0.0-git-2024-09-01 (#338931)

parents 6e2b44b3 0c3b35b3

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

+5 −0
Original line number Diff line number Diff line
@@ -84,8 +84,13 @@ let 
                }

                {

                  after = "19";

                  before = "20";

                  path = ../19;

                }

                {

                  after = "20";

                  path = ../git;

                }

              ];

              "clang/purity.patch" = [

                {

pkgs/development/compilers/llvm/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ let 
    "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

    "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";

    "20.0.0-git".gitRelease = {

      rev = "2579b411a13799534c8b8a22246134b88ba7785d";

      rev-version = "20.0.0-unstable-2024-08-25";

      sha256 = "sha256-/Gymj9bEoaAAH5kWPRflD+lBWyPjWBpYGnQsP5vAlsk=";

      rev = "837ee5b46a5f7f898f0de7e46a19600b896a0a1f";

      rev-version = "20.0.0-unstable-2024-09-01";

      sha256 = "sha256-GZDc1o7dLhPWrHA/LELsKs5ydHv9gn1bNFMg6Lfjs5Y=";

    };

  } // llvmVersions;

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

0 → 100644
+71 −0
Original line number Diff line number Diff line 
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

index 75b0080f6..c895b884c 100644

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

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

@@ -119,8 +119,8 @@ macro(add_clang_library name)

         install(TARGETS ${lib}

           COMPONENT ${lib}

           ${export_to_clangtargets}

-          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

-          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

+          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

+          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"

           RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

 

         if (NOT LLVM_ENABLE_IDE)

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

index e6ae4e19e..5ef01aea2 100644

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

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

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

 

 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)

 

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

index b5b6d2807..6b592d255 100644

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

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

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

           COMPONENT

             libclang-python-bindings

           DESTINATION

-            "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

+            "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")

 endforeach()

 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 3aca22c0b..3115353e3 100644

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

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

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

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})

   install(FILES lib/libscanbuild/${lib}

-          DESTINATION lib/libscanbuild

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

           COMPONENT scan-build-py)

 endforeach()

 

@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})

   install(FILES lib/libscanbuild/resources/${resource}

-          DESTINATION lib/libscanbuild/resources

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"

           COMPONENT scan-build-py)

 endforeach()

 

@@ -122,7 +122,7 @@ foreach(lib ${LibEar})

                      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})

   list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})

   install(FILES lib/libear/${lib}

-          DESTINATION lib/libear

+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

           COMPONENT scan-build-py)

 endforeach()