commit 9b8a66c3a43032efe486f44fdb09fc6f83048c8e · pyrox.dev/nixpkgs

doc/release-notes/rl-2511.section.md

···

       26
        
       

     

       27
        
       - GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       28
        
       

     

       0
        
       
     

       0
        
       
     

       29
        
       - GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

     

       30
        
       

     

       31
        
       - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

···

       26
        
       

     

       27
        
       - GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       28
        
       

     

       29
       +
       - LLVM 12 has been removed, as it has reached end‐of‐life upstream and is no longer supported.

     

       30
       +
       

     

       31
        
       - GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.

     

       32
        
       

     

       33
        
       - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

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

pkgs/development/compilers/llvm/12/clang/purity.patch pkgs/development/compilers/llvm/13/clang/purity.patch

pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch pkgs/development/compilers/llvm/13/compiler-rt/X86-support-extension.patch

-32

pkgs/development/compilers/llvm/12/compiler-rt/armv7l.patch

···

       1
       -
       diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake

     

       2
       -
       --- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake	2020-03-24 00:01:02.000000000 +0900

     

       3
       -
       +++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake	2020-05-10 03:42:00.883450706 +0900

     

       4
       -
       @@ -24,7 +24,7 @@

     

       5
       -
        

     

       6
       -
        

     

       7
       -
        set(ARM64 aarch64)

     

       8
       -
       -set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)

     

       9
       -
       +set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)

     

       10
       -
        set(HEXAGON hexagon)

     

       11
       -
        set(X86 i386)

     

       12
       -
        set(X86_64 x86_64)

     

       13
       -
       diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt

     

       14
       -
       --- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt	2020-03-24 00:01:02.000000000 +0900

     

       15
       -
       +++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt	2020-05-10 03:44:49.468579650 +0900

     

       16
       -
       @@ -474,6 +474,7 @@

     

       17
       -
        set(armv7_SOURCES ${arm_SOURCES})

     

       18
       -
        set(armv7s_SOURCES ${arm_SOURCES})

     

       19
       -
        set(armv7k_SOURCES ${arm_SOURCES})

     

       20
       -
       +set(armv7l_SOURCES ${arm_SOURCES})

     

       21
       -
        set(arm64_SOURCES ${aarch64_SOURCES})

     

       22
       -
        

     

       23
       -
        # macho_embedded archs

     

       24
       -
       @@ -595,7 +596,7 @@

     

       25
       -
          foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       26
       -
            if (CAN_TARGET_${arch})

     

       27
       -
              # For ARM archs, exclude any VFP builtins if VFP is not supported

     

       28
       -
       -      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")

     

       29
       -
       +      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")

     

       30
       -
                string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")

     

       31
       -
                check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)

     

       32
       -
                if(NOT COMPILER_RT_HAS_${arch}_VFP)

-33

pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch

···

       1
       -
       From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001

     

       2
       -
       From: Will Dietz <w@wdtz.org>

     

       3
       -
       Date: Tue, 19 Sep 2017 13:13:06 -0500

     

       4
       -
       Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that

     

       5
       -
        needs it

     

       6
       -
       

     

       7
       -
       ---

     

       8
       -
        cmake/Modules/AddCompilerRT.cmake |  8 ------

     

       9
       -
        test/asan/CMakeLists.txt          | 52 ---------------------------------------

     

       10
       -
        test/tsan/CMakeLists.txt          | 47 -----------------------------------

     

       11
       -
        3 files changed, 107 deletions(-)

     

       12
       -
       

     

       13
       -
       diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake

     

       14
       -
       index bc5fb9ff7..b64eb4246 100644

     

       15
       -
       --- a/cmake/Modules/AddCompilerRT.cmake

     

       16
       -
       +++ b/cmake/Modules/AddCompilerRT.cmake

     

       17
       -
       @@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)

     

       18
       -
                set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")

     

       19
       -
                set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")

     

       20
       -
              endif()

     

       21
       -
       -      if(APPLE)

     

       22
       -
       -        # Ad-hoc sign the dylibs

     

       23
       -
       -        add_custom_command(TARGET ${libname}

     

       24
       -
       -          POST_BUILD  

     

       25
       -
       -          COMMAND codesign --sign - $<TARGET_FILE:${libname}>

     

       26
       -
       -          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}

     

       27
       -
       -        )

     

       28
       -
       -      endif()

     

       29
       -
            endif()

     

       30
       -
            install(TARGETS ${libname}

     

       31
       -
              ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}

     

       32
       -
       2.14.1

     

       33
       -

pkgs/development/compilers/llvm/12/compiler-rt/gnu-install-dirs.patch pkgs/development/compilers/llvm/13/compiler-rt/gnu-install-dirs.patch

pkgs/development/compilers/llvm/12/compiler-rt/normalize-var.patch pkgs/development/compilers/llvm/13/compiler-rt/normalize-var.patch

-34

pkgs/development/compilers/llvm/12/libunwind/gnu-install-dirs.patch

···

       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index 48cb8e004e08..fec8144fb95a 100644

     

       3
       -
       --- a/CMakeLists.txt

     

       4
       -
       +++ b/CMakeLists.txt

     

       5
       -
       @@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH

     

       6
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD)

     

       7
       -
          project(libunwind LANGUAGES C CXX ASM)

     

       8
       -
        

     

       9
       -
       +  include(GNUInstallDirs)

     

       10
       -
       +

     

       11
       -
          set(PACKAGE_NAME libunwind)

     

       12
       -
          set(PACKAGE_VERSION 12.0.0)

     

       13
       -
          set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

     

       14
       -
       @@ -115,17 +117,17 @@ set(CMAKE_MODULE_PATH

     

       15
       -
        

     

       16
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       17
       -
          set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)

     

       18
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)

     

       19
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++)

     

       20
       -
          if(LIBCXX_LIBDIR_SUBDIR)

     

       21
       -
            string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})

     

       22
       -
            string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR})

     

       23
       -
          endif()

     

       24
       -
        elseif(LLVM_LIBRARY_OUTPUT_INTDIR)

     

       25
       -
          set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})

     

       26
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX})

     

       27
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX})

     

       28
       -
        else()

     

       29
       -
          set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX})

     

       30
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX})

     

       31
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX})

     

       32
       -
        endif()

     

       33
       -
        

     

       34
       -
        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR})

pkgs/development/compilers/llvm/12/lld/gnu-install-dirs.patch pkgs/development/compilers/llvm/13/lld/gnu-install-dirs.patch

-110

pkgs/development/compilers/llvm/12/lldb/gnu-install-dirs.patch

···

       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index b5633e21c56a..f2f1035e9238 100644

     

       3
       -
       --- a/CMakeLists.txt

     

       4
       -
       +++ b/CMakeLists.txt

     

       5
       -
       @@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH

     

       6
       -
        # If we are not building as part of LLVM, build LLDB as a standalone project,

     

       7
       -
        # using LLVM as an external library.

     

       8
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

     

       9
       -
       +  include(GNUInstallDirs)

     

       10
       -
       +

     

       11
       -
          project(lldb)

     

       12
       -
          include(LLDBStandalone)

     

       13
       -
        

     

       14
       -
       diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake

     

       15
       -
       index 4ed5c647c5d2..89f96e710d55 100644

     

       16
       -
       --- a/cmake/modules/AddLLDB.cmake

     

       17
       -
       +++ b/cmake/modules/AddLLDB.cmake

     

       18
       -
       @@ -107,13 +107,13 @@ function(add_lldb_library name)

     

       19
       -
          endif()

     

       20
       -
        

     

       21
       -
          if(PARAM_SHARED)

     

       22
       -
       -    set(install_dest lib${LLVM_LIBDIR_SUFFIX})

     

       23
       -
       +    set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       24
       -
            if(PARAM_INSTALL_PREFIX)

     

       25
       -
              set(install_dest ${PARAM_INSTALL_PREFIX})

     

       26
       -
            endif()

     

       27
       -
            # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS

     

       28
       -
            install(TARGETS ${name} COMPONENT ${name}

     

       29
       -
       -      RUNTIME DESTINATION bin

     

       30
       -
       +      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       31
       -
              LIBRARY DESTINATION ${install_dest}

     

       32
       -
              ARCHIVE DESTINATION ${install_dest}

     

       33
       -
              FRAMEWORK DESTINATION ${install_dest})

     

       34
       -
       diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake

     

       35
       -
       index 2fdf1502d055..37364341ff8b 100644

     

       36
       -
       --- a/cmake/modules/LLDBConfig.cmake

     

       37
       -
       +++ b/cmake/modules/LLDBConfig.cmake

     

       38
       -
       @@ -225,7 +225,7 @@ include_directories(BEFORE

     

       39
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       40
       -
          install(DIRECTORY include/

     

       41
       -
            COMPONENT lldb-headers

     

       42
       -
       -    DESTINATION include

     

       43
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       44
       -
            FILES_MATCHING

     

       45
       -
            PATTERN "*.h"

     

       46
       -
            PATTERN ".cmake" EXCLUDE

     

       47
       -
       @@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       48
       -
        

     

       49
       -
          install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/

     

       50
       -
            COMPONENT lldb-headers

     

       51
       -
       -    DESTINATION include

     

       52
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       53
       -
            FILES_MATCHING

     

       54
       -
            PATTERN "*.h"

     

       55
       -
            PATTERN ".cmake" EXCLUDE

     

       56
       -
       diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt

     

       57
       -
       index 734167e51bc5..f95761b5df58 100644

     

       58
       -
       --- a/tools/intel-features/CMakeLists.txt

     

       59
       -
       +++ b/tools/intel-features/CMakeLists.txt

     

       60
       -
       @@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT)

     

       61
       -
        endif()

     

       62
       -
        

     

       63
       -
        install(TARGETS lldbIntelFeatures

     

       64
       -
       -  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

       65
       -
       +  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       66
       -
       diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake

     

       67
       -
       index 752113b..010f187 100644

     

       68
       -
       --- a/cmake/modules/LLDBStandalone.cmake

     

       69
       -
       +++ b/cmake/modules/LLDBStandalone.cmake

     

       70
       -
       @@ -62,7 +62,7 @@ endif()

     

       71
       -
       

     

       72
       -
        # They are used as destination of target generators.

     

       73
       -
        set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)

     

       74
       -
       -set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})

     

       75
       -
       +set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       76
       -
        if(WIN32 OR CYGWIN)

     

       77
       -
          # DLL platform -- put DLLs into bin.

     

       78
       -
          set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})

     

       79
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       80
       -
       index b5633e2..86e4738 100644

     

       81
       -
       --- a/CMakeLists.txt

     

       82
       -
       +++ b/CMakeLists.txt

     

       83
       -
       @@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON)

     

       84
       -
          if(LLDB_BUILD_FRAMEWORK)

     

       85
       -
            set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")

     

       86
       -
          else()

     

       87
       -
       -    set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb")

     

       88
       -
       +    set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb")

     

       89
       -
          endif()

     

       90
       -
          get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)

     

       91
       -
          finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}")

     

       92
       -
       diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt

     

       93
       -
       index b5633e2..86e4738 100644

     

       94
       -
       --- a/source/API/CMakeLists.txt	2024-05-30 19:08:14.241656491 -0700

     

       95
       -
       +++ b/source/API/CMakeLists.txt	2024-05-30 19:08:48.218219667 -0700

     

       96
       -
       @@ -113,14 +113,6 @@

     

       97
       -
          ${option_install_prefix}

     

       98
       -
        )

     

       99
       -
        

     

       100
       -
       -# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so,

     

       101
       -
       -# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so

     

       102
       -
       -# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so

     

       103
       -
       -# that _lldb.so can be loaded from Python.

     

       104
       -
       -if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE)

     

       105
       -
       -  set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       106
       -
       -endif()

     

       107
       -
       -

     

       108
       -
        if(Python3_RPATH)

     

       109
       -
          set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")

     

       110
       -
          set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH   "${Python3_RPATH}")

pkgs/development/compilers/llvm/12/lldb/procfs.patch pkgs/development/compilers/llvm/13/lldb/procfs.patch

pkgs/development/compilers/llvm/12/lldb/resource-dir.patch pkgs/development/compilers/llvm/13/lldb/resource-dir.patch

-13

pkgs/development/compilers/llvm/12/llvm/fix-llvm-issue-49955.patch

···

       1
       -
       diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt b/lib/CodeGen/AsmPrinter/CMakeLists.txt

     

       2
       -
       index eb924282..c77c140b 100644

     

       3
       -
       --- a/lib/CodeGen/AsmPrinter/CMakeLists.txt

     

       4
       -
       +++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt

     

       5
       -
       @@ -44,3 +44,8 @@ add_llvm_component_library(LLVMAsmPrinter

     

       6
       -
          Support

     

       7
       -
          Target

     

       8
       -
          )

     

       9
       -
       +

     

       10
       -
       +if (CMAKE_COMPILER_IS_GNUCXX)

     

       11
       -
       +  set_source_files_properties(DwarfCompileUnit.cpp PROPERTIES

     

       12
       -
       +                              COMPILE_FLAGS -fno-strict-aliasing)

     

       13
       -
       +endif()

-105

pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs-polly.patch

···

       1
       -
       diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt

     

       2
       -
       index ca7c04c565bb..6ed5db5dd4f8 100644

     

       3
       -
       --- a/tools/polly/CMakeLists.txt

     

       4
       -
       +++ b/tools/polly/CMakeLists.txt

     

       5
       -
       @@ -2,7 +2,11 @@

     

       6
       -
        if (NOT DEFINED LLVM_MAIN_SRC_DIR)

     

       7
       -
          project(Polly)

     

       8
       -
          cmake_minimum_required(VERSION 3.13.4)

     

       9
       -
       +endif()

     

       10
       -
       +

     

       11
       -
       +include(GNUInstallDirs)

     

       12
       -
        

     

       13
       -
       +if (NOT DEFINED LLVM_MAIN_SRC_DIR)

     

       14
       -
          # Where is LLVM installed?

     

       15
       -
          find_package(LLVM CONFIG REQUIRED)

     

       16
       -
          set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR})

     

       17
       -
       @@ -122,13 +126,13 @@ include_directories(

     

       18
       -
        

     

       19
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       20
       -
          install(DIRECTORY include/

     

       21
       -
       -    DESTINATION include

     

       22
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       23
       -
            FILES_MATCHING

     

       24
       -
            PATTERN "*.h"

     

       25
       -
            )

     

       26
       -
        

     

       27
       -
          install(DIRECTORY ${POLLY_BINARY_DIR}/include/

     

       28
       -
       -    DESTINATION include

     

       29
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       30
       -
            FILES_MATCHING

     

       31
       -
            PATTERN "*.h"

     

       32
       -
            PATTERN "CMakeFiles" EXCLUDE

     

       33
       -
       diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt

     

       34
       -
       index 7cc129ba2e90..137be25e4b80 100644

     

       35
       -
       --- a/tools/polly/cmake/CMakeLists.txt

     

       36
       -
       +++ b/tools/polly/cmake/CMakeLists.txt

     

       37
       -
       @@ -79,18 +79,18 @@ file(GENERATE

     

       38
       -
        

     

       39
       -
        # Generate PollyConfig.cmake for the install tree.

     

       40
       -
        unset(POLLY_EXPORTS)

     

       41
       -
       -set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")

     

       42
       -
       +set(POLLY_INSTALL_PREFIX "")

     

       43
       -
        set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")

     

       44
       -
       -set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}")

     

       45
       -
       -set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}")

     

       46
       -
       +set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}")

     

       47
       -
       +set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       48
       -
        if (POLLY_BUNDLED_ISL)

     

       49
       -
          set(POLLY_CONFIG_INCLUDE_DIRS

     

       50
       -
       -    "${POLLY_INSTALL_PREFIX}/include"

     

       51
       -
       -    "${POLLY_INSTALL_PREFIX}/include/polly"

     

       52
       -
       +    "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}"

     

       53
       -
       +    "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly"

     

       54
       -
            )

     

       55
       -
        else()

     

       56
       -
          set(POLLY_CONFIG_INCLUDE_DIRS

     

       57
       -
       -    "${POLLY_INSTALL_PREFIX}/include"

     

       58
       -
       +    "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}"

     

       59
       -
            ${ISL_INCLUDE_DIRS}

     

       60
       -
            )

     

       61
       -
        endif()

     

       62
       -
       @@ -100,12 +100,12 @@ endif()

     

       63
       -
        foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS)

     

       64
       -
          get_target_property(tgt_type ${tgt} TYPE)

     

       65
       -
          if (tgt_type STREQUAL "EXECUTABLE")

     

       66
       -
       -    set(tgt_prefix "bin/")

     

       67
       -
       +    set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/")

     

       68
       -
          else()

     

       69
       -
       -    set(tgt_prefix "lib/")

     

       70
       -
       +    set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/")

     

       71
       -
          endif()

     

       72
       -
        

     

       73
       -
       -  set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>")

     

       74
       -
       +  set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>")

     

       75
       -
          file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path})

     

       76
       -
        

     

       77
       -
          if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY")

     

       78
       -
       diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake

     

       79
       -
       index 518a09b45a42..bd9d6f5542ad 100644

     

       80
       -
       --- a/tools/polly/cmake/polly_macros.cmake

     

       81
       -
       +++ b/tools/polly/cmake/polly_macros.cmake

     

       82
       -
       @@ -44,8 +44,8 @@ macro(add_polly_library name)

     

       83
       -
          if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly")

     

       84
       -
            install(TARGETS ${name}

     

       85
       -
              EXPORT LLVMExports

     

       86
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       87
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

       88
       -
       +	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

     

       89
       -
       +      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       90
       -
          endif()

     

       91
       -
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})

     

       92
       -
        endmacro(add_polly_library)

     

       93
       -
       diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt

     

       94
       -
       index 8991094d92c7..178d8ad606bb 100644

     

       95
       -
       --- a/tools/polly/lib/External/CMakeLists.txt

     

       96
       -
       +++ b/tools/polly/lib/External/CMakeLists.txt

     

       97
       -
       @@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL)

     

       98
       -
            install(DIRECTORY

     

       99
       -
              ${ISL_SOURCE_DIR}/include/

     

       100
       -
              ${ISL_BINARY_DIR}/include/

     

       101
       -
       -      DESTINATION include/polly

     

       102
       -
       +      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly

     

       103
       -
              FILES_MATCHING

     

       104
       -
              PATTERN "*.h"

     

       105
       -
              PATTERN "CMakeFiles" EXCLUDE

-417

pkgs/development/compilers/llvm/12/llvm/gnu-install-dirs.patch

···

       1
       -
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       2
       -
       index 277d0fe54d7b..af69c8be8745 100644

     

       3
       -
       --- a/CMakeLists.txt

     

       4
       -
       +++ b/CMakeLists.txt

     

       5
       -
       @@ -256,15 +256,21 @@ if (CMAKE_BUILD_TYPE AND

     

       6
       -
          message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")

     

       7
       -
        endif()

     

       8
       -
        

     

       9
       -
       +include(GNUInstallDirs)

     

       10
       -
       +

     

       11
       -
        set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )

     

       12
       -
        

     

       13
       -
       -set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")

     

       14
       -
       +set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING

     

       15
       -
       +    "Path for binary subdirectory (defaults to 'bin')")

     

       16
       -
        mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)

     

       17
       -
        

     

       18
       -
        set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING

     

       19
       -
            "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)")

     

       20
       -
        mark_as_advanced(LLVM_UTILS_INSTALL_DIR)

     

       21
       -
        

     

       22
       -
       +set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING

     

       23
       -
       +	"Path for CMake subdirectory (defaults to lib/cmake/llvm)" )

     

       24
       -
       +

     

       25
       -
        # They are used as destination of target generators.

     

       26
       -
        set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)

     

       27
       -
        set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})

     

       28
       -
       @@ -567,9 +573,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF)

     

       29
       -
        option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON)

     

       30
       -
        option (LLVM_ENABLE_BINDINGS "Build bindings." ON)

     

       31
       -
        

     

       32
       -
       -set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html"

     

       33
       -
       +set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html"

     

       34
       -
            CACHE STRING "Doxygen-generated HTML documentation install directory")

     

       35
       -
       -set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html"

     

       36
       -
       +set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html"

     

       37
       -
            CACHE STRING "OCamldoc-generated HTML documentation install directory")

     

       38
       -
        

     

       39
       -
        option (LLVM_BUILD_EXTERNAL_COMPILER_RT

     

       40
       -
       @@ -1027,7 +1033,7 @@ endif()

     

       41
       -
        

     

       42
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       43
       -
          install(DIRECTORY include/llvm include/llvm-c

     

       44
       -
       -    DESTINATION include

     

       45
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       46
       -
            COMPONENT llvm-headers

     

       47
       -
            FILES_MATCHING

     

       48
       -
            PATTERN "*.def"

     

       49
       -
       @@ -1038,7 +1044,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       50
       -
            )

     

       51
       -
        

     

       52
       -
          install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c

     

       53
       -
       -    DESTINATION include

     

       54
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       55
       -
            COMPONENT llvm-headers

     

       56
       -
            FILES_MATCHING

     

       57
       -
            PATTERN "*.def"

     

       58
       -
       @@ -1052,13 +1058,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       59
       -
        

     

       60
       -
          if (LLVM_INSTALL_MODULEMAPS)

     

       61
       -
            install(DIRECTORY include/llvm include/llvm-c

     

       62
       -
       -            DESTINATION include

     

       63
       -
       +            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       64
       -
                    COMPONENT llvm-headers

     

       65
       -
                    FILES_MATCHING

     

       66
       -
                    PATTERN "module.modulemap"

     

       67
       -
                    )

     

       68
       -
            install(FILES include/llvm/module.install.modulemap

     

       69
       -
       -            DESTINATION include/llvm

     

       70
       -
       +            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm

     

       71
       -
                    COMPONENT llvm-headers

     

       72
       -
                    RENAME "module.extern.modulemap"

     

       73
       -
                    )

     

       74
       -
       diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake

     

       75
       -
       index 97c9980c7de3..409e8b615f75 100644

     

       76
       -
       --- a/cmake/modules/AddLLVM.cmake

     

       77
       -
       +++ b/cmake/modules/AddLLVM.cmake

     

       78
       -
       @@ -804,9 +804,9 @@ macro(add_llvm_library name)

     

       79
       -
        

     

       80
       -
              install(TARGETS ${name}

     

       81
       -
                      ${export_to_llvmexports}

     

       82
       -
       -              LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       83
       -
       -              ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       84
       -
       -              RUNTIME DESTINATION bin COMPONENT ${name})

     

       85
       -
       +              LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       86
       -
       +              ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name}

     

       87
       -
       +              RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name})

     

       88
       -
        

     

       89
       -
              if (NOT LLVM_ENABLE_IDE)

     

       90
       -
                add_llvm_install_targets(install-${name}

     

       91
       -
       @@ -1022,7 +1022,7 @@ function(process_llvm_pass_plugins)

     

       92
       -
                  "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})")

     

       93
       -
              install(FILES

     

       94
       -
                  ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake

     

       95
       -
       -          DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}

     

       96
       -
       +          DESTINATION ${LLVM_INSTALL_CMAKE_DIR}

     

       97
       -
                  COMPONENT cmake-exports)

     

       98
       -
        

     

       99
       -
              set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def")

     

       100
       -
       @@ -1242,7 +1242,7 @@ macro(add_llvm_example name)

     

       101
       -
          endif()

     

       102
       -
          add_llvm_executable(${name} ${ARGN})

     

       103
       -
          if( LLVM_BUILD_EXAMPLES )

     

       104
       -
       -    install(TARGETS ${name} RUNTIME DESTINATION examples)

     

       105
       -
       +    install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)

     

       106
       -
          endif()

     

       107
       -
          set_target_properties(${name} PROPERTIES FOLDER "Examples")

     

       108
       -
        endmacro(add_llvm_example name)

     

       109
       -
       @@ -1854,7 +1854,7 @@ function(llvm_install_library_symlink name dest type)

     

       110
       -
          set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX})

     

       111
       -
          set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX})

     

       112
       -
        

     

       113
       -
       -  set(output_dir lib${LLVM_LIBDIR_SUFFIX})

     

       114
       -
       +  set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX})

     

       115
       -
          if(WIN32 AND "${type}" STREQUAL "SHARED")

     

       116
       -
            set(output_dir bin)

     

       117
       -
          endif()

     

       118
       -
       @@ -1871,7 +1871,7 @@ function(llvm_install_library_symlink name dest type)

     

       119
       -
          endif()

     

       120
       -
        endfunction()

     

       121
       -
        

     

       122
       -
       -function(llvm_install_symlink name dest)

     

       123
       -
       +function(llvm_install_symlink name dest output_dir)

     

       124
       -
          cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN})

     

       125
       -
          foreach(path ${CMAKE_MODULE_PATH})

     

       126
       -
            if(EXISTS ${path}/LLVMInstallSymlink.cmake)

     

       127
       -
       @@ -1894,7 +1894,7 @@ function(llvm_install_symlink name dest)

     

       128
       -
          set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX})

     

       129
       -
        

     

       130
       -
          install(SCRIPT ${INSTALL_SYMLINK}

     

       131
       -
       -          CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})"

     

       132
       -
       +          CODE "install_symlink(${full_name} ${full_dest} ${output_dir})"

     

       133
       -
                  COMPONENT ${component})

     

       134
       -
        

     

       135
       -
          if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)

     

       136
       -
       @@ -1977,7 +1977,8 @@ function(add_llvm_tool_symlink link_name target)

     

       137
       -
            endif()

     

       138
       -
        

     

       139
       -
            if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS)

     

       140
       -
       -      llvm_install_symlink(${link_name} ${target})

     

       141
       -
       +      GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR)

     

       142
       -
       +      llvm_install_symlink(${link_name} ${target} ${output_dir})

     

       143
       -
            endif()

     

       144
       -
          endif()

     

       145
       -
        endfunction()

     

       146
       -
       @@ -2100,9 +2101,9 @@ function(llvm_setup_rpath name)

     

       147
       -
        

     

       148
       -
          if (APPLE)

     

       149
       -
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

       150
       -
       -    set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       151
       -
       +    set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       152
       -
          elseif(UNIX)

     

       153
       -
       -    set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       154
       -
       +    set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       155
       -
            if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")

     

       156
       -
              set_property(TARGET ${name} APPEND_STRING PROPERTY

     

       157
       -
                           LINK_FLAGS " -Wl,-z,origin ")

     

       158
       -
       diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake

     

       159
       -
       index 554046b20edf..4d1ad980641e 100644

     

       160
       -
       --- a/cmake/modules/AddOCaml.cmake

     

       161
       -
       +++ b/cmake/modules/AddOCaml.cmake

     

       162
       -
       @@ -144,9 +144,9 @@ function(add_ocaml_library name)

     

       163
       -
          endforeach()

     

       164
       -
        

     

       165
       -
          if( APPLE )

     

       166
       -
       -    set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       167
       -
       +    set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       168
       -
          elseif( UNIX )

     

       169
       -
       -    set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}")

     

       170
       -
       +    set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       171
       -
          endif()

     

       172
       -
          list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}")

     

       173
       -
        

     

       174
       -
       diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake

     

       175
       -
       index e80c3b5c1cac..482f6d715ef5 100644

     

       176
       -
       --- a/cmake/modules/AddSphinxTarget.cmake

     

       177
       -
       +++ b/cmake/modules/AddSphinxTarget.cmake

     

       178
       -
       @@ -90,7 +90,7 @@ function (add_sphinx_target builder project)

     

       179
       -
                endif()

     

       180
       -
              elseif (builder STREQUAL html)

     

       181
       -
                string(TOUPPER "${project}" project_upper)

     

       182
       -
       -        set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html"

     

       183
       -
       +        set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html"

     

       184
       -
                    CACHE STRING "HTML documentation install directory for ${project}")

     

       185
       -
        

     

       186
       -
                # '/.' indicates: copy the contents of the directory directly into

     

       187
       -
       diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt

     

       188
       -
       index 505dc9a29d70..36e6c63af3f4 100644

     

       189
       -
       --- a/cmake/modules/CMakeLists.txt

     

       190
       -
       +++ b/cmake/modules/CMakeLists.txt

     

       191
       -
       @@ -1,4 +1,4 @@

     

       192
       -
       -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)

     

       193
       -
       +set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')")

     

       194
       -
        set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")

     

       195
       -
        

     

       196
       -
        # First for users who use an installed LLVM, create the LLVMExports.cmake file.

     

       197
       -
       @@ -107,13 +107,13 @@ foreach(p ${_count})

     

       198
       -
          set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}

     

       199
       -
        get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)")

     

       200
       -
        endforeach(p)

     

       201
       -
       -set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include")

     

       202
       -
       +set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")

     

       203
       -
        set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}")

     

       204
       -
        set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}")

     

       205
       -
       -set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}")

     

       206
       -
       +set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       207
       -
        set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}")

     

       208
       -
        set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}")

     

       209
       -
       -set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin")

     

       210
       -
       +set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")

     

       211
       -
        

     

       212
       -
        # Generate a default location for lit

     

       213
       -
        if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)

     

       214
       -
       diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake

     

       215
       -
       index 09fed8085c23..aa79f192abf0 100644

     

       216
       -
       --- a/cmake/modules/LLVMInstallSymlink.cmake

     

       217
       -
       +++ b/cmake/modules/LLVMInstallSymlink.cmake

     

       218
       -
       @@ -10,7 +10,7 @@ function(install_symlink name target outdir)

     

       219
       -
            set(LINK_OR_COPY copy)

     

       220
       -
          endif()

     

       221
       -
        

     

       222
       -
       -  set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/")

     

       223
       -
       +  set(bindir "${DESTDIR}${outdir}/")

     

       224
       -
        

     

       225
       -
          message(STATUS "Creating ${name}")

     

       226
       -
        

     

       227
       -
       diff --git a/docs/CMake.rst b/docs/CMake.rst

     

       228
       -
       index bb821b417ad9..6a528f7c2ad3 100644

     

       229
       -
       --- a/docs/CMake.rst

     

       230
       -
       +++ b/docs/CMake.rst

     

       231
       -
       @@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``.

     

       232
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

       233
       -
          Extra suffix to append to the directory where libraries are to be

     

       234
       -
          installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64``

     

       235
       -
       -  to install libraries to ``/usr/lib64``.

     

       236
       -
       +  to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``.

     

       237
       -
        

     

       238
       -
        **CMAKE_C_FLAGS**:STRING

     

       239
       -
          Extra flags to use when compiling C source files.

     

       240
       -
       @@ -550,8 +550,8 @@ LLVM-specific variables

     

       241
       -
        

     

       242
       -
        **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING

     

       243
       -
          The path to install Doxygen-generated HTML documentation to. This path can

     

       244
       -
       -  either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to

     

       245
       -
       -  `share/doc/llvm/doxygen-html`.

     

       246
       -
       +  either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to

     

       247
       -
       +  `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`.

     

       248
       -
        

     

       249
       -
        **LLVM_ENABLE_SPHINX**:BOOL

     

       250
       -
          If specified, CMake will search for the ``sphinx-build`` executable and will make

     

       251
       -
       @@ -582,13 +582,33 @@ LLVM-specific variables

     

       252
       -
        

     

       253
       -
        **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING

     

       254
       -
          The path to install Sphinx-generated HTML documentation to. This path can

     

       255
       -
       -  either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to

     

       256
       -
       -  `share/doc/llvm/html`.

     

       257
       -
       +  either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to

     

       258
       -
       +  `${CMAKE_INSTALL_DOCDIR}/${project}/html`.

     

       259
       -
        

     

       260
       -
        **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING

     

       261
       -
          The path to install OCamldoc-generated HTML documentation to. This path can

     

       262
       -
       -  either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to

     

       263
       -
       -  `share/doc/llvm/ocaml-html`.

     

       264
       -
       +  either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to

     

       265
       -
       +  `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`.

     

       266
       -
       +

     

       267
       -
       +**CMAKE_INSTALL_BINDIR**:STRING

     

       268
       -
       +  The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``.

     

       269
       -
       +  Defaults to `bin`.

     

       270
       -
       +

     

       271
       -
       +**CMAKE_INSTALL_LIBDIR**:STRING

     

       272
       -
       +  The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``.

     

       273
       -
       +  Defaults to `lib`.

     

       274
       -
       +

     

       275
       -
       +**CMAKE_INSTALL_INCLUDEDIR**:STRING

     

       276
       -
       +  The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``.

     

       277
       -
       +  Defaults to `include`.

     

       278
       -
       +

     

       279
       -
       +**CMAKE_INSTALL_DOCDIR**:STRING

     

       280
       -
       +  The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``.

     

       281
       -
       +  Defaults to `share/doc`.

     

       282
       -
       +

     

       283
       -
       +**CMAKE_INSTALL_MANDIR**:STRING

     

       284
       -
       +  The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``.

     

       285
       -
       +  Defaults to `share/man`.

     

       286
       -
        

     

       287
       -
        **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL

     

       288
       -
          macOS Only: If enabled CMake will generate a target named

     

       289
       -
       @@ -786,9 +806,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``).

     

       290
       -
        

     

       291
       -
        This file is available in two different locations.

     

       292
       -
        

     

       293
       -
       -* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where

     

       294
       -
       -  ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM.

     

       295
       -
       -  On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``.

     

       296
       -
       +* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where

     

       297
       -
       +  ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are

     

       298
       -
       +  installed as part of an installed version of LLVM. This is typically

     

       299
       -
       +  ``cmake/llvm/`` within the lib directory. On Linux, this is typically

     

       300
       -
       +  ``/usr/lib/cmake/llvm/LLVMConfig.cmake``.

     

       301
       -
        

     

       302
       -
        * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where

     

       303
       -
          ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only

     

       304
       -
       diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt

     

       305
       -
       index bb96edb4b4bf..678c22fb43c8 100644

     

       306
       -
       --- a/examples/Bye/CMakeLists.txt

     

       307
       -
       +++ b/examples/Bye/CMakeLists.txt

     

       308
       -
       @@ -14,6 +14,6 @@ if (NOT WIN32)

     

       309
       -
            BUILDTREE_ONLY

     

       310
       -
           )

     

       311
       -
        

     

       312
       -
       -  install(TARGETS ${name} RUNTIME DESTINATION examples)

     

       313
       -
       +  install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)

     

       314
       -
          set_target_properties(${name} PROPERTIES FOLDER "Examples")

     

       315
       -
        endif()

     

       316
       -
       diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt

     

       317
       -
       index b46319f24fc8..2feabd1954e4 100644

     

       318
       -
       --- a/include/llvm/CMakeLists.txt

     

       319
       -
       +++ b/include/llvm/CMakeLists.txt

     

       320
       -
       @@ -5,5 +5,5 @@ add_subdirectory(Frontend)

     

       321
       -
        # If we're doing an out-of-tree build, copy a module map for generated

     

       322
       -
        # header files into the build area.

     

       323
       -
        if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")

     

       324
       -
       -  configure_file(module.modulemap.build module.modulemap COPYONLY)

     

       325
       -
       +  configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY)

     

       326
       -
        endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")

     

       327
       -
       diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in

     

       328
       -
       index ebe5b73a5c65..70c497be12f5 100644

     

       329
       -
       --- a/tools/llvm-config/BuildVariables.inc.in

     

       330
       -
       +++ b/tools/llvm-config/BuildVariables.inc.in

     

       331
       -
       @@ -23,6 +23,10 @@

     

       332
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       333
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       334
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

       335
       -
       +#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@"

     

       336
       -
       +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"

     

       337
       -
       +#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       338
       -
       +#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@"

     

       339
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       340
       -
        #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"

     

       341
       -
        #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@"

     

       342
       -
       diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp

     

       343
       -
       index 1a2f04552d13..44fa7d3eec6b 100644

     

       344
       -
       --- a/tools/llvm-config/llvm-config.cpp

     

       345
       -
       +++ b/tools/llvm-config/llvm-config.cpp

     

       346
       -
       @@ -357,12 +357,26 @@ int main(int argc, char **argv) {

     

       347
       -
                ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include");

     

       348
       -
          } else {

     

       349
       -
            ActivePrefix = CurrentExecPrefix;

     

       350
       -
       -    ActiveIncludeDir = ActivePrefix + "/include";

     

       351
       -
       -    SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR));

     

       352
       -
       -    sys::fs::make_absolute(ActivePrefix, path);

     

       353
       -
       -    ActiveBinDir = std::string(path.str());

     

       354
       -
       -    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;

     

       355
       -
       -    ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";

     

       356
       -
       +    {

     

       357
       -
       +      SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR));

     

       358
       -
       +      sys::fs::make_absolute(ActivePrefix, path);

     

       359
       -
       +      ActiveIncludeDir = std::string(path.str());

     

       360
       -
       +    }

     

       361
       -
       +    {

     

       362
       -
       +      SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR));

     

       363
       -
       +      sys::fs::make_absolute(ActivePrefix, path);

     

       364
       -
       +      ActiveBinDir = std::string(path.str());

     

       365
       -
       +    }

     

       366
       -
       +    {

     

       367
       -
       +      SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX));

     

       368
       -
       +      sys::fs::make_absolute(ActivePrefix, path);

     

       369
       -
       +      ActiveLibDir = std::string(path.str());

     

       370
       -
       +    }

     

       371
       -
       +    {

     

       372
       -
       +      SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR));

     

       373
       -
       +      sys::fs::make_absolute(ActivePrefix, path);

     

       374
       -
       +      ActiveCMakeDir = std::string(path.str());

     

       375
       -
       +    }

     

       376
       -
            ActiveIncludeOption = "-I" + ActiveIncludeDir;

     

       377
       -
          }

     

       378
       -
        

     

       379
       -
       diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt

     

       380
       -
       index 2963f97cad88..69d66c9c9ca1 100644

     

       381
       -
       --- a/tools/lto/CMakeLists.txt

     

       382
       -
       +++ b/tools/lto/CMakeLists.txt

     

       383
       -
       @@ -25,7 +25,7 @@ add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS

     

       384
       -
            intrinsics_gen)

     

       385
       -
        

     

       386
       -
        install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h

     

       387
       -
       -  DESTINATION include/llvm-c

     

       388
       -
       +  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c

     

       389
       -
          COMPONENT LTO)

     

       390
       -
        

     

       391
       -
        if (APPLE)

     

       392
       -
       diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt

     

       393
       -
       index ead73ec13a8f..250362021f17 100644

     

       394
       -
       --- a/tools/opt-viewer/CMakeLists.txt

     

       395
       -
       +++ b/tools/opt-viewer/CMakeLists.txt

     

       396
       -
       @@ -8,7 +8,7 @@ set (files

     

       397
       -
        

     

       398
       -
        foreach (file ${files})

     

       399
       -
          install(PROGRAMS ${file}

     

       400
       -
       -    DESTINATION share/opt-viewer

     

       401
       -
       +    DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer

     

       402
       -
            COMPONENT opt-viewer)

     

       403
       -
        endforeach (file)

     

       404
       -
        

     

       405
       -
       diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt

     

       406
       -
       index 865436247270..ce1daa62f6ab 100644

     

       407
       -
       --- a/tools/remarks-shlib/CMakeLists.txt

     

       408
       -
       +++ b/tools/remarks-shlib/CMakeLists.txt

     

       409
       -
       @@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC)

     

       410
       -
          endif()

     

       411
       -
          

     

       412
       -
          install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h

     

       413
       -
       -    DESTINATION include/llvm-c

     

       414
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c

     

       415
       -
            COMPONENT Remarks)

     

       416
       -
        

     

       417
       -
          if (APPLE)

pkgs/development/compilers/llvm/12/llvm/no-pipes.patch pkgs/development/compilers/llvm/13/llvm/no-pipes.patch

+30 -34

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

···

       22
        
             inherit llvm lld;

     

       23
        
           };

     

       24
        
         }

     

       25
       -
         (

     

       26
       -
           ''

     

       27
       -
             mkdir -p $out/bin

     

       28
       -
             for prog in ${lld}/bin/*; do

     

       29
       -
               ln -s $prog $out/bin/${targetPrefix}$(basename $prog)

     

       30
       -
             done

     

       31
       -
             for prog in ${llvm}/bin/*; do

     

       32
       -
               ln -sf $prog $out/bin/${targetPrefix}$(basename $prog)

     

       33
       -
             done

     

       34
        
       

     

       35
       -
             llvmBin="${llvm}/bin"

     

       36
        
       

     

       37
       -
             ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ar

     

       38
       -
             ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}dlltool

     

       39
       -
             ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ranlib

     

       40
       -
             ln -s $llvmBin/llvm-cxxfilt $out/bin/${targetPrefix}c++filt

     

       41
       -
             ln -s $llvmBin/llvm-dwp $out/bin/${targetPrefix}dwp

     

       42
       -
             ln -s $llvmBin/llvm-nm $out/bin/${targetPrefix}nm

     

       43
       -
             ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}objcopy

     

       44
       -
             ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}strip

     

       45
       -
             ln -s $llvmBin/llvm-objdump $out/bin/${targetPrefix}objdump

     

       46
       -
             ln -s $llvmBin/llvm-readobj $out/bin/${targetPrefix}readelf

     

       47
       -
             ln -s $llvmBin/llvm-size $out/bin/${targetPrefix}size

     

       48
       -
             ln -s $llvmBin/llvm-strings $out/bin/${targetPrefix}strings

     

       49
       -
             ln -s $llvmBin/llvm-symbolizer $out/bin/${targetPrefix}addr2line

     

       50
        
       

     

       51
       -
             if [ -e "$llvmBin/llvm-debuginfod" ]; then

     

       52
       -
               ln -s $llvmBin/llvm-debuginfod $out/bin/${targetPrefix}debuginfod

     

       53
       -
               ln -s $llvmBin/llvm-debuginfod-find $out/bin/${targetPrefix}debuginfod-find

     

       54
       -
             fi

     

       55
        
       

     

       56
       -
             ln -s ${lld}/bin/lld $out/bin/${targetPrefix}ld

     

       57
        
       

     

       58
       -
             # Only >=13 show GNU windres compatible in help

     

       59
       -
           ''

     

       60
       -
           + lib.optionalString (lib.versionAtLeast release_version "13") ''

     

       61
       -
             ln -s $llvmBin/llvm-rc $out/bin/${targetPrefix}windres

     

       62
       -
           ''

     

       63
       -
         )

···

       22
        
             inherit llvm lld;

     

       23
        
           };

     

       24
        
         }

     

       25
       +
         ''

     

       26
       +
           mkdir -p $out/bin

     

       27
       +
           for prog in ${lld}/bin/*; do

     

       28
       +
             ln -s $prog $out/bin/${targetPrefix}$(basename $prog)

     

       29
       +
           done

     

       30
       +
           for prog in ${llvm}/bin/*; do

     

       31
       +
             ln -sf $prog $out/bin/${targetPrefix}$(basename $prog)

     

       32
       +
           done

     

       0
        
       
     

       33
        
       

     

       34
       +
           llvmBin="${llvm}/bin"

     

       35
        
       

     

       36
       +
           ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ar

     

       37
       +
           ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}dlltool

     

       38
       +
           ln -s $llvmBin/llvm-ar $out/bin/${targetPrefix}ranlib

     

       39
       +
           ln -s $llvmBin/llvm-cxxfilt $out/bin/${targetPrefix}c++filt

     

       40
       +
           ln -s $llvmBin/llvm-dwp $out/bin/${targetPrefix}dwp

     

       41
       +
           ln -s $llvmBin/llvm-nm $out/bin/${targetPrefix}nm

     

       42
       +
           ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}objcopy

     

       43
       +
           ln -s $llvmBin/llvm-objcopy $out/bin/${targetPrefix}strip

     

       44
       +
           ln -s $llvmBin/llvm-objdump $out/bin/${targetPrefix}objdump

     

       45
       +
           ln -s $llvmBin/llvm-readobj $out/bin/${targetPrefix}readelf

     

       46
       +
           ln -s $llvmBin/llvm-size $out/bin/${targetPrefix}size

     

       47
       +
           ln -s $llvmBin/llvm-strings $out/bin/${targetPrefix}strings

     

       48
       +
           ln -s $llvmBin/llvm-symbolizer $out/bin/${targetPrefix}addr2line

     

       49
        
       

     

       50
       +
           if [ -e "$llvmBin/llvm-debuginfod" ]; then

     

       51
       +
             ln -s $llvmBin/llvm-debuginfod $out/bin/${targetPrefix}debuginfod

     

       52
       +
             ln -s $llvmBin/llvm-debuginfod-find $out/bin/${targetPrefix}debuginfod-find

     

       53
       +
           fi

     

       54
        
       

     

       55
       +
           ln -s ${lld}/bin/lld $out/bin/${targetPrefix}ld

     

       56
        
       

     

       57
       +
           # Only >=13 show GNU windres compatible in help

     

       58
       +
           ln -s $llvmBin/llvm-rc $out/bin/${targetPrefix}windres

     

       59
       +
         ''

     

       0
        
       
     

       0
        
       
     

       0

+21 -36

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

···

       84
        
             # Fix build on armv6l

     

       85
        
             ./armv6-no-ldrexd-strexd.patch

     

       86
        
           ]

     

       87
       -
           ++ lib.optional (lib.versions.major release_version == "12") (fetchpatch {

     

       88
       -
             # fixes the parallel build on aarch64 darwin

     

       89
       -
             name = "fix-symlink-race-aarch64-darwin.patch";

     

       90
       -
             url = "https://github.com/llvm/llvm-project/commit/b31080c596246bc26d2493cfd5e07f053cf9541c.patch";

     

       91
       -
             relative = "compiler-rt";

     

       92
       -
             hash = "sha256-Cv2NC8402yU7QaTR6TzdH+qyWRy+tTote7KKWtKRWFQ=";

     

       0
        
       
     

       0
        
       
     

       93
        
           })

     

       94
       -
           ++ lib.optional (

     

       95
       -
             lib.versions.major release_version == "12"

     

       96
       -
             || (lib.versionAtLeast release_version "14" && lib.versionOlder release_version "18")

     

       97
       -
           ) (getVersionFile "compiler-rt/gnu-install-dirs.patch")

     

       98
        
           ++

     

       99
       -
             lib.optional (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")

     

       100
       -
               (fetchpatch {

     

       101
       -
                 name = "cfi_startproc-after-label.patch";

     

       102
       -
                 url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";

     

       103
       -
                 stripLen = 1;

     

       104
       -
                 hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";

     

       105
       -
               })

     

       106
       -
           ++

     

       107
       -
             lib.optional (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")

     

       108
        
               # Prevent a compilation error on darwin

     

       109
        
               (getVersionFile "compiler-rt/darwin-targetconditionals.patch")

     

       110
        
           # TODO: make unconditional and remove in <15 section below. Causes rebuilds.

     
···

       123
        
             ./armv6-mcr-dmb.patch

     

       124
        
             ./armv6-sync-ops-no-thumb.patch

     

       125
        
           ]

     

       126
       -
           ++

     

       127
       -
             lib.optionals (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")

     

       128
       -
               [

     

       129
       -
                 # Fix build on armv6l

     

       130
       -
                 ./armv6-scudo-no-yield.patch

     

       131
       -
               ]

     

       132
       -
           ++ lib.optionals (lib.versionAtLeast release_version "13") [

     

       133
        
             (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")

     

       134
        
           ]

     

       135
        
           ++ lib.optional (lib.versions.major release_version == "19") (fetchpatch {

     
···

       277
        
               ''

     

       278
        
             )

     

       279
        
           )

     

       280
       -
           +

     

       281
       -
             lib.optionalString

     

       282
       -
               (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "14")

     

       283
       -
               ''

     

       284
       -
                 # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py

     

       285
       -
                 # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15.

     

       286
       -
                 substituteInPlace ../libcxx/utils/merge_archives.py \

     

       287
       -
                   --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \

     

       288
       -
                   --replace-fail "distutils.spawn." ""

     

       289
       -
               ''

     

       290
        
           +

     

       291
        
             lib.optionalString (lib.versionAtLeast release_version "19")

     

       292
        
               # codesign in sigtool doesn't support the various options used by the build

···

       84
        
             # Fix build on armv6l

     

       85
        
             ./armv6-no-ldrexd-strexd.patch

     

       86
        
           ]

     

       87
       +
           ++ lib.optional (lib.versionAtLeast release_version "14" && lib.versionOlder release_version "18") (

     

       88
       +
             getVersionFile "compiler-rt/gnu-install-dirs.patch"

     

       89
       +
           )

     

       90
       +
           ++ lib.optional (lib.versionOlder release_version "18") (fetchpatch {

     

       91
       +
             name = "cfi_startproc-after-label.patch";

     

       92
       +
             url = "https://github.com/llvm/llvm-project/commit/7939ce39dac0078fef7183d6198598b99c652c88.patch";

     

       93
       +
             stripLen = 1;

     

       94
       +
             hash = "sha256-tGqXsYvUllFrPa/r/dsKVlwx5IrcJGccuR1WAtUg7/o=";

     

       95
        
           })

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       96
        
           ++

     

       97
       +
             lib.optional (lib.versionOlder release_version "18")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       98
        
               # Prevent a compilation error on darwin

     

       99
        
               (getVersionFile "compiler-rt/darwin-targetconditionals.patch")

     

       100
        
           # TODO: make unconditional and remove in <15 section below. Causes rebuilds.

     
···

       113
        
             ./armv6-mcr-dmb.patch

     

       114
        
             ./armv6-sync-ops-no-thumb.patch

     

       115
        
           ]

     

       116
       +
           ++ lib.optionals (lib.versionOlder release_version "18") [

     

       117
       +
             # Fix build on armv6l

     

       118
       +
             ./armv6-scudo-no-yield.patch

     

       119
       +
           ]

     

       120
       +
           ++ [

     

       0
        
       
     

       0
        
       
     

       121
        
             (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")

     

       122
        
           ]

     

       123
        
           ++ lib.optional (lib.versions.major release_version == "19") (fetchpatch {

     
···

       265
        
               ''

     

       266
        
             )

     

       267
        
           )

     

       268
       +
           + lib.optionalString (lib.versionOlder release_version "14") ''

     

       269
       +
             # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py

     

       270
       +
             # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15.

     

       271
       +
             substituteInPlace ../libcxx/utils/merge_archives.py \

     

       272
       +
               --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \

     

       273
       +
               --replace-fail "distutils.spawn." ""

     

       274
       +
           ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       275
        
           +

     

       276
        
             lib.optionalString (lib.versionAtLeast release_version "19")

     

       277
        
               # codesign in sigtool doesn't support the various options used by the build

+1 -9

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

···

       113
        
         cmakeFlags = [

     

       114
        
           (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" (lib.concatStringsSep ";" runtimes))

     

       115
        
         ]

     

       116
       -
         ++

     

       117
       -
           lib.optionals

     

       118
       -
             (

     

       119
       -
               stdenv.hostPlatform.isWasm

     

       120
       -
               || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin)

     

       121
       -
             )

     

       122
       -
             [

     

       123
       -
               (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       124
       -
             ]

     

       125
        
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       0
        
       
     

       126
        
           (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)

     

       127
        
           (lib.cmakeBool "UNIX" true) # Required otherwise libc++ fails to detect the correct linker

     

       128
        
         ]

···

       113
        
         cmakeFlags = [

     

       114
        
           (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" (lib.concatStringsSep ";" runtimes))

     

       115
        
         ]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       116
        
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       117
       +
           (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       118
        
           (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)

     

       119
        
           (lib.cmakeBool "UNIX" true) # Required otherwise libc++ fails to detect the correct linker

     

       120
        
         ]

-3

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

···

       80
        
           ++ lib.optional (lib.versionAtLeast release_version "15") (

     

       81
        
             lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind"

     

       82
        
           )

     

       83
       -
           ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [

     

       84
       -
             (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       85
       -
           ]

     

       86
        
           ++ devExtraCmakeFlags;

     

       87
        
       

     

       88
        
           prePatch =

···

       80
        
           ++ lib.optional (lib.versionAtLeast release_version "15") (

     

       81
        
             lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind"

     

       82
        
           )

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       83
        
           ++ devExtraCmakeFlags;

     

       84
        
       

     

       85
        
           prePatch =

+1 -1

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

···

       72
        
             "dev"

     

       73
        
           ];

     

       74
        
       

     

       75
       -
           sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${finalAttrs.src.name}/lldb";

     

       76
        
       

     

       77
        
           patches =

     

       78
        
             let

···

       72
        
             "dev"

     

       73
        
           ];

     

       74
        
       

     

       75
       +
           sourceRoot = "${finalAttrs.src.name}/lldb";

     

       76
        
       

     

       77
        
           patches =

     

       78
        
             let

+7 -63

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

···

       129
        
               # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       130
        
               # statically against the necessary LLVM components always.

     

       131
        
               ./llvm-config-link-static.patch

     

       132
       -
             ++ lib.optionals (lib.versions.major release_version == "12") [

     

       133
       -
               # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955

     

       134
       -
               (getVersionFile "llvm/fix-llvm-issue-49955.patch")

     

       135
       -
       

     

       136
       -
               # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test.

     

       137
       -
               (fetchpatch {

     

       138
       -
                 name = "uops-CMOV16rm-noreg.diff";

     

       139
       -
                 url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff";

     

       140
       -
                 sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi";

     

       141
       -
                 stripLen = 1;

     

       142
       -
               })

     

       143
       -
             ]

     

       144
        
             # Support custom installation dirs

     

       145
        
             # Originally based off https://reviews.llvm.org/D99484

     

       146
        
             # Latest state: https://github.com/llvm/llvm-project/pull/125376

     
···

       339
        
             ) ncurses)

     

       340
        
             ++ [ zlib ];

     

       341
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       342
        
           postPatch =

     

       343
        
             optionalString stdenv.hostPlatform.isDarwin (

     

       344
        
               ''

     
···

       470
        
                 substituteInPlace unittests/IR/CMakeLists.txt \

     

       471
        
                   --replace-fail "PassBuilderCallbacksTest.cpp" ""

     

       472
        
                 rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       0
        
       
     

       473
        
               ''

     

       474
       -
             + lib.optionalString (lib.versionAtLeast release_version "13") ''

     

       475
       -
               rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       476
       -
             ''

     

       477
       -
             + lib.optionalString (lib.versionOlder release_version "13") ''

     

       478
       -
               # TODO: Fix failing tests:

     

       479
       -
               rm test/DebugInfo/X86/vla-multi.ll

     

       480
       -
             ''

     

       481
        
             +

     

       482
        
               # Fails in the presence of anti-virus software or other intrusion-detection software that

     

       483
        
               # modifies the atime when run. See #284056.

     
···

       540
        
               ''

     

       541
        
             + ''

     

       542
        
               patchShebangs test/BugPoint/compile-custom.ll.py

     

       543
       -
             ''

     

       544
       -
             +

     

       545
       -
               # Tweak tests to ignore namespace part of type to support

     

       546
       -
               # gcc-12: https://gcc.gnu.org/PR103598.

     

       547
       -
               # The change below mangles strings like:

     

       548
       -
               #    CHECK-NEXT: Starting llvm::Function pass manager run.

     

       549
       -
               # to:

     

       550
       -
               #    CHECK-NEXT: Starting {{.*}}Function pass manager run.

     

       551
       -
               (lib.optionalString (lib.versionOlder release_version "13") (

     

       552
       -
                 ''

     

       553
       -
                   for f in \

     

       554
       -
                     test/Other/new-pass-manager.ll \

     

       555
       -
                     test/Other/new-pm-O0-defaults.ll \

     

       556
       -
                     test/Other/new-pm-defaults.ll \

     

       557
       -
                     test/Other/new-pm-lto-defaults.ll \

     

       558
       -
                     test/Other/new-pm-thinlto-defaults.ll \

     

       559
       -
                     test/Other/pass-pipeline-parsing.ll \

     

       560
       -
                     test/Transforms/Inline/cgscc-incremental-invalidate.ll \

     

       561
       -
                     test/Transforms/Inline/clear-analyses.ll \

     

       562
       -
                     test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \

     

       563
       -
                     test/Transforms/SCCP/ipsccp-preserve-analysis.ll \

     

       564
       -
                     test/Transforms/SCCP/preserve-analysis.ll \

     

       565
       -
                     test/Transforms/SROA/dead-inst.ll \

     

       566
       -
                     test/tools/gold/X86/new-pm.ll \

     

       567
       -
                     ; do

     

       568
       -
                     echo "PATCH: $f"

     

       569
       -
                     substituteInPlace $f \

     

       570
       -
                       --replace-quiet 'Starting llvm::' 'Starting {{.*}}' \

     

       571
       -
                       --replace-quiet 'Finished llvm::' 'Finished {{.*}}'

     

       572
       -
                   done

     

       573
       -
                 ''

     

       574
       -
                 +

     

       575
       -
                   # gcc-13 fix

     

       576
       -
                   ''

     

       577
       -
                     sed -i '/#include <string>/i#include <cstdint>' \

     

       578
       -
                       include/llvm/DebugInfo/Symbolize/DIPrinter.h

     

       579
       -
                   ''

     

       580
       -
               ));

     

       581
        
       

     

       582
        
           # Workaround for configure flags that need to have spaces

     

       583
        
           preConfigure = ''

     
···

       810
        
               }

     

       811
        
           )

     

       812
        
         )

     

       813
       -
         // lib.optionalAttrs (lib.versionAtLeast release_version "13") {

     

       814
       -
           nativeCheckInputs = [

     

       815
       -
             which

     

       816
       -
           ]

     

       817
       -
           ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl;

     

       818
       -
         }

     

       819
        
         // lib.optionalAttrs (lib.versionOlder release_version "15") {

     

       820
        
           # hacky fix: created binaries need to be run before installation

     

       821
        
           preBuild = ''

···

       129
        
               # a native libLLVM.so (which would fail) we force llvm-config to be linked

     

       130
        
               # statically against the necessary LLVM components always.

     

       131
        
               ./llvm-config-link-static.patch

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       132
        
             # Support custom installation dirs

     

       133
        
             # Originally based off https://reviews.llvm.org/D99484

     

       134
        
             # Latest state: https://github.com/llvm/llvm-project/pull/125376

     
···

       327
        
             ) ncurses)

     

       328
        
             ++ [ zlib ];

     

       329
        
       

     

       330
       +
           nativeCheckInputs = [

     

       331
       +
             which

     

       332
       +
           ]

     

       333
       +
           ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl;

     

       334
       +
       

     

       335
        
           postPatch =

     

       336
        
             optionalString stdenv.hostPlatform.isDarwin (

     

       337
        
               ''

     
···

       463
        
                 substituteInPlace unittests/IR/CMakeLists.txt \

     

       464
        
                   --replace-fail "PassBuilderCallbacksTest.cpp" ""

     

       465
        
                 rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       466
       +
                 rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       467
        
               ''

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       468
        
             +

     

       469
        
               # Fails in the presence of anti-virus software or other intrusion-detection software that

     

       470
        
               # modifies the atime when run. See #284056.

     
···

       527
        
               ''

     

       528
        
             + ''

     

       529
        
               patchShebangs test/BugPoint/compile-custom.ll.py

     

       530
       +
             '';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       531
        
       

     

       532
        
           # Workaround for configure flags that need to have spaces

     

       533
        
           preConfigure = ''

     
···

       760
        
               }

     

       761
        
           )

     

       762
        
         )

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       763
        
         // lib.optionalAttrs (lib.versionOlder release_version "15") {

     

       764
        
           # hacky fix: created binaries need to be run before installation

     

       765
        
           preBuild = ''

+9 -13

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

···

       2
        
         "clang/gnu-install-dirs.patch" = [

     

       3
        
           {

     

       4
        
             before = "14";

     

       5
       -
             path = ../12;

     

       6
        
           }

     

       7
        
           {

     

       8
        
             after = "19";

     
···

       21
        
           }

     

       22
        
           {

     

       23
        
             before = "16";

     

       24
       -
             path = ../12;

     

       25
        
           }

     

       26
        
         ];

     

       27
        
         "clang/aarch64-tblgen.patch" = [

     
···

       44
        
           }

     

       45
        
           {

     

       46
        
             before = "14";

     

       47
       -
             path = ../12;

     

       48
        
           }

     

       49
        
         ];

     

       50
        
         "llvm/gnu-install-dirs.patch" = [

     
···

       126
        
           }

     

       127
        
           {

     

       128
        
             before = "15";

     

       129
       -
             path = ../12;

     

       130
        
           }

     

       131
        
         ];

     

       132
        
         "compiler-rt/armv6-scudo-libatomic.patch" = [

     
···

       147
        
         "compiler-rt/armv7l.patch" = [

     

       148
        
           {

     

       149
        
             before = "15";

     

       150
       -
             after = "13";

     

       151
        
             path = ../13;

     

       152
        
           }

     

       153
        
         ];

     

       154
        
         "compiler-rt/gnu-install-dirs.patch" = [

     

       155
        
           {

     

       156
        
             before = "14";

     

       157
       -
             path = ../12;

     

       158
        
           }

     

       159
        
           {

     

       160
       -
             after = "13";

     

       161
        
             before = "15";

     

       162
        
             path = ../14;

     

       163
        
           }

     
···

       173
        
         ];

     

       174
        
         "compiler-rt/darwin-targetconditionals.patch" = [

     

       175
        
           {

     

       176
       -
             after = "13";

     

       177
        
             path = ../13;

     

       178
        
           }

     

       179
        
         ];

     

       180
        
         "compiler-rt/codesign.patch" = [

     

       181
        
           {

     

       182
       -
             after = "13";

     

       183
        
             path = ../13;

     

       184
        
           }

     

       185
        
         ];

     
···

       190
        
           }

     

       191
        
           {

     

       192
        
             before = "16";

     

       193
       -
             path = ../12;

     

       194
        
           }

     

       195
        
         ];

     

       196
        
         "lldb/procfs.patch" = [

     
···

       200
        
           }

     

       201
        
           {

     

       202
        
             before = "15";

     

       203
       -
             path = ../12;

     

       204
        
           }

     

       205
        
         ];

     

       206
        
         "lldb/resource-dir.patch" = [

     

       207
        
           {

     

       208
        
             before = "16";

     

       209
       -
             path = ../12;

     

       210
        
           }

     

       211
        
         ];

     

       212
        
         "llvm/no-pipes.patch" = [

     

       213
        
           {

     

       214
        
             before = "16";

     

       215
       -
             path = ../12;

     

       216
        
           }

     

       217
        
         ];

     

       218
        
         "openmp/fix-find-tool.patch" = [

···

       2
        
         "clang/gnu-install-dirs.patch" = [

     

       3
        
           {

     

       4
        
             before = "14";

     

       5
       +
             path = ../13;

     

       6
        
           }

     

       7
        
           {

     

       8
        
             after = "19";

     
···

       21
        
           }

     

       22
        
           {

     

       23
        
             before = "16";

     

       24
       +
             path = ../13;

     

       25
        
           }

     

       26
        
         ];

     

       27
        
         "clang/aarch64-tblgen.patch" = [

     
···

       44
        
           }

     

       45
        
           {

     

       46
        
             before = "14";

     

       47
       +
             path = ../13;

     

       48
        
           }

     

       49
        
         ];

     

       50
        
         "llvm/gnu-install-dirs.patch" = [

     
···

       126
        
           }

     

       127
        
           {

     

       128
        
             before = "15";

     

       129
       +
             path = ../13;

     

       130
        
           }

     

       131
        
         ];

     

       132
        
         "compiler-rt/armv6-scudo-libatomic.patch" = [

     
···

       147
        
         "compiler-rt/armv7l.patch" = [

     

       148
        
           {

     

       149
        
             before = "15";

     

       0
        
       
     

       150
        
             path = ../13;

     

       151
        
           }

     

       152
        
         ];

     

       153
        
         "compiler-rt/gnu-install-dirs.patch" = [

     

       154
        
           {

     

       155
        
             before = "14";

     

       156
       +
             path = ../13;

     

       157
        
           }

     

       158
        
           {

     

       0
        
       
     

       159
        
             before = "15";

     

       160
        
             path = ../14;

     

       161
        
           }

     
···

       171
        
         ];

     

       172
        
         "compiler-rt/darwin-targetconditionals.patch" = [

     

       173
        
           {

     

       0
        
       
     

       174
        
             path = ../13;

     

       175
        
           }

     

       176
        
         ];

     

       177
        
         "compiler-rt/codesign.patch" = [

     

       178
        
           {

     

       0
        
       
     

       179
        
             path = ../13;

     

       180
        
           }

     

       181
        
         ];

     
···

       186
        
           }

     

       187
        
           {

     

       188
        
             before = "16";

     

       189
       +
             path = ../13;

     

       190
        
           }

     

       191
        
         ];

     

       192
        
         "lldb/procfs.patch" = [

     
···

       196
        
           }

     

       197
        
           {

     

       198
        
             before = "15";

     

       199
       +
             path = ../13;

     

       200
        
           }

     

       201
        
         ];

     

       202
        
         "lldb/resource-dir.patch" = [

     

       203
        
           {

     

       204
        
             before = "16";

     

       205
       +
             path = ../13;

     

       206
        
           }

     

       207
        
         ];

     

       208
        
         "llvm/no-pipes.patch" = [

     

       209
        
           {

     

       210
        
             before = "16";

     

       211
       +
             path = ../13;

     

       212
        
           }

     

       213
        
         ];

     

       214
        
         "openmp/fix-find-tool.patch" = [

-1

pkgs/development/compilers/llvm/default.nix

···

       22
        
       }@packageSetArgs:

     

       23
        
       let

     

       24
        
         versions = {

     

       25
       -
           "12.0.1".officialRelease.sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";

     

       26
        
           "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k";

     

       27
        
           "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";

     

       28
        
           "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";

···

       22
        
       }@packageSetArgs:

     

       23
        
       let

     

       24
        
         versions = {

     

       0
        
       
     

       25
        
           "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k";

     

       26
        
           "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";

     

       27
        
           "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";

-14

pkgs/development/compilers/llvm/update.sh

···

       24
        
         readonly SOURCES=(

     

       25
        
           "llvm.monorepoSrc"

     

       26
        
         )

     

       27
       -
       elif [ "$VERSION_MAJOR" -eq "13" ]; then

     

       28
       -
         readonly SOURCES=(

     

       29
       -
           "llvm.src"

     

       30
       -
         )

     

       31
        
       else

     

       32
        
         readonly SOURCES=(

     

       33
       -
           "clang-unwrapped.src"

     

       34
       -
           "compiler-rt.src"

     

       35
       -
           "clang-unwrapped.clang-tools-extra_src"

     

       36
       -
           "libcxx.src"

     

       37
       -
           "libcxxabi.src"

     

       38
       -
           "libunwind.src"

     

       39
       -
           "lld.src"

     

       40
       -
           "lldb.src"

     

       41
        
           "llvm.src"

     

       42
       -
           "llvm.polly_src"

     

       43
       -
           "openmp.src"

     

       44
        
         )

     

       45
        
       fi

     

       46

···

       24
        
         readonly SOURCES=(

     

       25
        
           "llvm.monorepoSrc"

     

       26
        
         )

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
       else

     

       28
        
         readonly SOURCES=(

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       29
        
           "llvm.src"

     

       0
        
       
     

       0
        
       
     

       30
        
         )

     

       31
        
       fi

     

       32

pkgs/test/default.nix

···

       16
        
                   (filter (n: n != "llvmPackages_9"))

     

       17
        
                   (filter (n: n != "llvmPackages_10"))

     

       18
        
                   (filter (n: n != "llvmPackages_11"))

     

       0
        
       
     

       19
        
                 ];

     

       20
        
                 tests = lib.genAttrs pkgSets (

     

       21
        
                   name:

···

       16
        
                   (filter (n: n != "llvmPackages_9"))

     

       17
        
                   (filter (n: n != "llvmPackages_10"))

     

       18
        
                   (filter (n: n != "llvmPackages_11"))

     

       19
       +
                   (filter (n: n != "llvmPackages_12"))

     

       20
        
                 ];

     

       21
        
                 tests = lib.genAttrs pkgSets (

     

       22
        
                   name:

+13 -8

pkgs/top-level/aliases.nix

···

       698
        
         cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09

     

       699
        
       

     

       700
        
         # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.

     

       701
       -
         clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08

     

       702
       -
         clang12Stdenv = lowPrio llvmPackages_12.stdenv; # preserve, reason: see above

     

       703
        
         clang13Stdenv = lowPrio llvmPackages_13.stdenv; # preserve, reason: see above

     

       704
        
         clang14Stdenv = lowPrio llvmPackages_14.stdenv; # preserve, reason: see above

     

       705
        
         clang15Stdenv = lowPrio llvmPackages_15.stdenv; # preserve, reason: see above

     
···

       708
        
         clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above

     

       709
        
         clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above

     

       710
        
       

     

       711
       -
         clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       712
       -
         clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       713
       -
       

     

       714
       -
         clang-tools_12 = llvmPackages_12.clang-tools; # Added 2024-04-22

     

       715
        
         clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22

     

       716
        
         clang-tools_14 = llvmPackages_14.clang-tools; # Added 2024-04-22

     

       717
        
         clang-tools_15 = llvmPackages_15.clang-tools; # Added 2024-04-22

     
···

       1485
        
       

     

       1486
        
         llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02

     

       1487
        
       

     

       0
        
       
     

       0
        
       
     

       1488
        
         lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1489
        
         lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1490
       -
         llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1491
       -
         llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1492
        
       

     

       1493
        
         lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17

     

       1494
        
         loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25

···

       698
        
         cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09

     

       699
        
       

     

       700
        
         # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.

     

       0
        
       
     

       0
        
       
     

       701
        
         clang13Stdenv = lowPrio llvmPackages_13.stdenv; # preserve, reason: see above

     

       702
        
         clang14Stdenv = lowPrio llvmPackages_14.stdenv; # preserve, reason: see above

     

       703
        
         clang15Stdenv = lowPrio llvmPackages_15.stdenv; # preserve, reason: see above

     
···

       706
        
         clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above

     

       707
        
         clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above

     

       708
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       709
        
         clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22

     

       710
        
         clang-tools_14 = llvmPackages_14.clang-tools; # Added 2024-04-22

     

       711
        
         clang-tools_15 = llvmPackages_15.clang-tools; # Added 2024-04-22

     
···

       1479
        
       

     

       1480
        
         llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02

     

       1481
        
       

     

       1482
       +
         llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1483
       +
         llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1484
        
         lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1485
        
         lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1486
       +
         clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1487
       +
         clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08

     

       1488
       +
         clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1489
       +
       

     

       1490
       +
         llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1491
       +
         llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1492
       +
         lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1493
       +
         lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1494
       +
         clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1495
       +
         clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1496
       +
         clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1497
        
       

     

       1498
        
         lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17

     

       1499
        
         loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25

-6

pkgs/top-level/all-packages.nix

···

       4633
        
         clang-manpages = llvmPackages.clang-manpages;

     

       4634
        
       

     

       4635
        
         clang = llvmPackages.clang;

     

       4636
       -
         clang_12 = llvmPackages_12.clang;

     

       4637
        
         clang_13 = llvmPackages_13.clang;

     

       4638
        
         clang_14 = llvmPackages_14.clang;

     

       4639
        
         clang_15 = llvmPackages_15.clang;

     
···

       5365
        
         };

     

       5366
        
       

     

       5367
        
         lld = llvmPackages.lld;

     

       5368
       -
         lld_12 = llvmPackages_12.lld;

     

       5369
        
         lld_13 = llvmPackages_13.lld;

     

       5370
        
         lld_14 = llvmPackages_14.lld;

     

       5371
        
         lld_15 = llvmPackages_15.lld;

     
···

       5373
        
         lld_17 = llvmPackages_17.lld;

     

       5374
        
       

     

       5375
        
         lldb = llvmPackages.lldb;

     

       5376
       -
         lldb_12 = llvmPackages_12.lldb;

     

       5377
        
         lldb_13 = llvmPackages_13.lldb;

     

       5378
        
         lldb_14 = llvmPackages_14.lldb;

     

       5379
        
         lldb_15 = llvmPackages_15.lldb;

     
···

       5381
        
         lldb_17 = llvmPackages_17.lldb;

     

       5382
        
       

     

       5383
        
         llvm = llvmPackages.llvm;

     

       5384
       -
         llvm_12 = llvmPackages_12.llvm;

     

       5385
        
         llvm_13 = llvmPackages_13.llvm;

     

       5386
        
         llvm_14 = llvmPackages_14.llvm;

     

       5387
        
         llvm_15 = llvmPackages_15.llvm;

     
···

       5402
        
           (rec {

     

       5403
        
             llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });

     

       5404
        
       

     

       5405
       -
             llvmPackages_12 = llvmPackagesSet."12";

     

       5406
        
             llvmPackages_13 = llvmPackagesSet."13";

     

       5407
        
             llvmPackages_14 = llvmPackagesSet."14";

     

       5408
        
             llvmPackages_15 = llvmPackagesSet."15";

     
···

       5440
        
       

     

       5441
        
             mkLLVMPackages = llvmPackagesSet.mkPackage;

     

       5442
        
           })

     

       5443
       -
           llvmPackages_12

     

       5444
        
           llvmPackages_13

     

       5445
        
           llvmPackages_14

     

       5446
        
           llvmPackages_15

···

       4633
        
         clang-manpages = llvmPackages.clang-manpages;

     

       4634
        
       

     

       4635
        
         clang = llvmPackages.clang;

     

       0
        
       
     

       4636
        
         clang_13 = llvmPackages_13.clang;

     

       4637
        
         clang_14 = llvmPackages_14.clang;

     

       4638
        
         clang_15 = llvmPackages_15.clang;

     
···

       5364
        
         };

     

       5365
        
       

     

       5366
        
         lld = llvmPackages.lld;

     

       0
        
       
     

       5367
        
         lld_13 = llvmPackages_13.lld;

     

       5368
        
         lld_14 = llvmPackages_14.lld;

     

       5369
        
         lld_15 = llvmPackages_15.lld;

     
···

       5371
        
         lld_17 = llvmPackages_17.lld;

     

       5372
        
       

     

       5373
        
         lldb = llvmPackages.lldb;

     

       0
        
       
     

       5374
        
         lldb_13 = llvmPackages_13.lldb;

     

       5375
        
         lldb_14 = llvmPackages_14.lldb;

     

       5376
        
         lldb_15 = llvmPackages_15.lldb;

     
···

       5378
        
         lldb_17 = llvmPackages_17.lldb;

     

       5379
        
       

     

       5380
        
         llvm = llvmPackages.llvm;

     

       0
        
       
     

       5381
        
         llvm_13 = llvmPackages_13.llvm;

     

       5382
        
         llvm_14 = llvmPackages_14.llvm;

     

       5383
        
         llvm_15 = llvmPackages_15.llvm;

     
···

       5398
        
           (rec {

     

       5399
        
             llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });

     

       5400
        
       

     

       0
        
       
     

       5401
        
             llvmPackages_13 = llvmPackagesSet."13";

     

       5402
        
             llvmPackages_14 = llvmPackagesSet."14";

     

       5403
        
             llvmPackages_15 = llvmPackagesSet."15";

     
···

       5435
        
       

     

       5436
        
             mkLLVMPackages = llvmPackagesSet.mkPackage;

     

       5437
        
           })

     

       0
        
       
     

       5438
        
           llvmPackages_13

     

       5439
        
           llvmPackages_14

     

       5440
        
           llvmPackages_15