commit 791fe23b635b4b62182129a2d623f3f713a97478 · pyrox.dev/nixpkgs

+1 -1

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

···

       26
       26
        
       

     

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

     

       28
       28
        
       

     

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

     

       29
       29
       +
       - LLVM 12 and 13 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       30
       30
        
       

     

       31
       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
       32

-235

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

···

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

     

       2
       2
       -
       index 9e74014134a0..976e6a1757fd 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4)

     

       6
       6
       -
        if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )

     

       7
       7
       -
          project(Clang)

     

       8
       8
       -
        

     

       9
       9
       -
       +  include(GNUInstallDirs)

     

       10
       10
       -
       +

     

       11
       11
       -
          set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")

     

       12
       12
       -
          set(CMAKE_CXX_STANDARD_REQUIRED YES)

     

       13
       13
       -
          set(CMAKE_CXX_EXTENSIONS NO)

     

       14
       14
       -
       @@ -416,7 +418,7 @@ include_directories(BEFORE

     

       15
       15
       -
        

     

       16
       16
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       17
       17
       -
          install(DIRECTORY include/clang include/clang-c

     

       18
       18
       -
       -    DESTINATION include

     

       19
       19
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       20
       20
       -
            COMPONENT clang-headers

     

       21
       21
       -
            FILES_MATCHING

     

       22
       22
       -
            PATTERN "*.def"

     

       23
       23
       -
       @@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       24
       24
       -
            )

     

       25
       25
       -
        

     

       26
       26
       -
          install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang

     

       27
       27
       -
       -    DESTINATION include

     

       28
       28
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       29
       29
       -
            COMPONENT clang-headers

     

       30
       30
       -
            FILES_MATCHING

     

       31
       31
       -
            PATTERN "CMakeFiles" EXCLUDE

     

       32
       32
       -
       @@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       33
       33
       -
        

     

       34
       34
       -
          add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh)

     

       35
       35
       -
          install(PROGRAMS utils/bash-autocomplete.sh

     

       36
       36
       -
       -          DESTINATION share/clang

     

       37
       37
       -
       +          DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       38
       38
       -
                  COMPONENT bash-autocomplete)

     

       39
       39
       -
          if(NOT LLVM_ENABLE_IDE)

     

       40
       40
       -
            add_llvm_install_targets(install-bash-autocomplete

     

       41
       41
       -
       diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake

     

       42
       42
       -
       index 704278a0e93b..d25c8d325c71 100644

     

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

     

       44
       44
       -
       +++ b/cmake/modules/AddClang.cmake

     

       45
       45
       -
       @@ -123,9 +123,9 @@ macro(add_clang_library name)

     

       46
       46
       -
                install(TARGETS ${lib}

     

       47
       47
       -
                  COMPONENT ${lib}

     

       48
       48
       -
                  ${export_to_clangtargets}

     

       49
       49
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       50
       50
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       51
       51
       -
       -          RUNTIME DESTINATION bin)

     

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

     

       53
       53
       -
       +          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

     

       54
       54
       -
       +          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

     

       55
       55
       -
        

     

       56
       56
       -
                if (NOT LLVM_ENABLE_IDE)

     

       57
       57
       -
                  add_llvm_install_targets(install-${lib}

     

       58
       58
       -
       @@ -170,7 +170,7 @@ macro(add_clang_tool name)

     

       59
       59
       -
        

     

       60
       60
       -
            install(TARGETS ${name}

     

       61
       61
       -
              ${export_to_clangtargets}

     

       62
       62
       -
       -      RUNTIME DESTINATION bin

     

       63
       63
       -
       +      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       64
       64
       -
              COMPONENT ${name})

     

       65
       65
       -
        

     

       66
       66
       -
            if(NOT LLVM_ENABLE_IDE)

     

       67
       67
       -
       @@ -185,7 +185,7 @@ endmacro()

     

       68
       68
       -
        macro(add_clang_symlink name dest)

     

       69
       69
       -
          add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)

     

       70
       70
       -
          # Always generate install targets

     

       71
       71
       -
       -  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)

     

       72
       72
       -
       +  llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)

     

       73
       73
       -
        endmacro()

     

       74
       74
       -
        

     

       75
       75
       -
        function(clang_target_link_libraries target type)

     

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

     

       77
       77
       -
       index b2c0ce8dd4a0..19e5443d8c25 100644

     

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

     

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

     

       80
       80
       -
       @@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES

     

       81
       81
       -
          FOLDER "Misc"

     

       82
       82
       -
          RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

     

       83
       83
       -
        

     

       84
       84
       -
       -set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

     

       85
       85
       -
       +set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)

     

       86
       86
       -
        

     

       87
       87
       -
        install(

     

       88
       88
       -
          FILES ${files} ${generated_files}

     

       89
       89
       -
       diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt

     

       90
       90
       -
       index ceef4b08637c..8efad5520ca4 100644

     

       91
       91
       -
       --- a/tools/c-index-test/CMakeLists.txt

     

       92
       92
       -
       +++ b/tools/c-index-test/CMakeLists.txt

     

       93
       93
       -
       @@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       94
       94
       -
            set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH

     

       95
       95
       -
               "@executable_path/../../lib")

     

       96
       96
       -
          else()

     

       97
       97
       -
       -    set(INSTALL_DESTINATION bin)

     

       98
       98
       -
       +    set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR})

     

       99
       99
       -
          endif()

     

       100
       100
       -
        

     

       101
       101
       -
          install(TARGETS c-index-test

     

       102
       102
       -
       diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt

     

       103
       103
       -
       index 35ecdb11253c..d77d75de0094 100644

     

       104
       104
       -
       --- a/tools/clang-format/CMakeLists.txt

     

       105
       105
       -
       +++ b/tools/clang-format/CMakeLists.txt

     

       106
       106
       -
       @@ -21,20 +21,20 @@ if( LLVM_LIB_FUZZING_ENGINE OR LLVM_USE_SANITIZE_COVERAGE )

     

       107
       107
       -
        endif()

     

       108
       108
       -
        

     

       109
       109
       -
        install(PROGRAMS clang-format-bbedit.applescript

     

       110
       110
       -
       -  DESTINATION share/clang

     

       111
       111
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       112
       112
       -
          COMPONENT clang-format)

     

       113
       113
       -
        install(PROGRAMS clang-format-diff.py

     

       114
       114
       -
       -  DESTINATION share/clang

     

       115
       115
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       116
       116
       -
          COMPONENT clang-format)

     

       117
       117
       -
        install(PROGRAMS clang-format-sublime.py

     

       118
       118
       -
       -  DESTINATION share/clang

     

       119
       119
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       120
       120
       -
          COMPONENT clang-format)

     

       121
       121
       -
        install(PROGRAMS clang-format.el

     

       122
       122
       -
       -  DESTINATION share/clang

     

       123
       123
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       124
       124
       -
          COMPONENT clang-format)

     

       125
       125
       -
        install(PROGRAMS clang-format.py

     

       126
       126
       -
       -  DESTINATION share/clang

     

       127
       127
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       128
       128
       -
          COMPONENT clang-format)

     

       129
       129
       -
        install(PROGRAMS git-clang-format

     

       130
       130
       -
       -  DESTINATION bin

     

       131
       131
       -
       +  DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       132
       132
       -
          COMPONENT clang-format)

     

       133
       133
       -
       diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt

     

       134
       134
       -
       index cda8e29ec5b1..0134d8ccd70b 100644

     

       135
       135
       -
       --- a/tools/clang-rename/CMakeLists.txt

     

       136
       136
       -
       +++ b/tools/clang-rename/CMakeLists.txt

     

       137
       137
       -
       @@ -19,8 +19,8 @@ clang_target_link_libraries(clang-rename

     

       138
       138
       -
          )

     

       139
       139
       -
        

     

       140
       140
       -
        install(PROGRAMS clang-rename.py

     

       141
       141
       -
       -  DESTINATION share/clang

     

       142
       142
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       143
       143
       -
          COMPONENT clang-rename)

     

       144
       144
       -
        install(PROGRAMS clang-rename.el

     

       145
       145
       -
       -  DESTINATION share/clang

     

       146
       146
       -
       +  DESTINATION ${CMAKE_INSTALL_DATADIR}/clang

     

       147
       147
       -
          COMPONENT clang-rename)

     

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

     

       149
       149
       -
       index 51ff2e7e1565..1ed5f8a079a1 100644

     

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

     

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

     

       152
       152
       -
       @@ -166,7 +166,7 @@ endif()

     

       153
       153
       -
        if(INTERNAL_INSTALL_PREFIX)

     

       154
       154
       -
          set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include")

     

       155
       155
       -
        else()

     

       156
       156
       -
       -  set(LIBCLANG_HEADERS_INSTALL_DESTINATION include)

     

       157
       157
       -
       +  set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

     

       158
       158
       -
        endif()

     

       159
       159
       -
        

     

       160
       160
       -
        install(DIRECTORY ../../include/clang-c

     

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

     

       162
       162
       -
                  COMPONENT

     

       163
       163
       -
                    libclang-python-bindings

     

       164
       164
       -
                  DESTINATION

     

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

     

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

     

       167
       167
       -
        endforeach()

     

       168
       168
       -
        if(NOT LLVM_ENABLE_IDE)

     

       169
       169
       -
          add_custom_target(libclang-python-bindings)

     

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

     

       171
       171
       -
       index ec0702d76f18..d25d982f51da 100644

     

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

     

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

     

       174
       174
       -
       @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)

     

       175
       175
       -
                               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     

       176
       176
       -
            list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

     

       177
       177
       -
            install(PROGRAMS bin/${BinFile}

     

       178
       178
       -
       -            DESTINATION bin

     

       179
       179
       -
       +            DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       180
       180
       -
                    COMPONENT scan-build)

     

       181
       181
       -
          endforeach()

     

       182
       182
       -
        

     

       183
       183
       -
       @@ -61,7 +61,7 @@ if(CLANG_INSTALL_SCANBUILD)

     

       184
       184
       -
                               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})

     

       185
       185
       -
            list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})

     

       186
       186
       -
            install(PROGRAMS libexec/${LibexecFile}

     

       187
       187
       -
       -            DESTINATION libexec

     

       188
       188
       -
       +            DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}

     

       189
       189
       -
                    COMPONENT scan-build)

     

       190
       190
       -
          endforeach()

     

       191
       191
       -
        

     

       192
       192
       -
       @@ -89,7 +89,7 @@ if(CLANG_INSTALL_SCANBUILD)

     

       193
       193
       -
                               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})

     

       194
       194
       -
            list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile})

     

       195
       195
       -
            install(FILES share/scan-build/${ShareFile}

     

       196
       196
       -
       -            DESTINATION share/scan-build

     

       197
       197
       -
       +            DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build

     

       198
       198
       -
                    COMPONENT scan-build)

     

       199
       199
       -
          endforeach()

     

       200
       200
       -
        

     

       201
       201
       -
       diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt

     

       202
       202
       -
       index dd3d33439299..fea19c12ce70 100644

     

       203
       203
       -
       --- a/tools/scan-view/CMakeLists.txt

     

       204
       204
       -
       +++ b/tools/scan-view/CMakeLists.txt

     

       205
       205
       -
       @@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW)

     

       206
       206
       -
                               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     

       207
       207
       -
            list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

     

       208
       208
       -
            install(PROGRAMS bin/${BinFile}

     

       209
       209
       -
       -            DESTINATION bin

     

       210
       210
       -
       +            DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       211
       211
       -
                    COMPONENT scan-view)

     

       212
       212
       -
          endforeach()

     

       213
       213
       -
        

     

       214
       214
       -
       @@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW)

     

       215
       215
       -
                               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})

     

       216
       216
       -
            list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})

     

       217
       217
       -
            install(FILES share/${ShareFile}

     

       218
       218
       -
       -            DESTINATION share/scan-view

     

       219
       219
       -
       +            DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view

     

       220
       220
       -
                    COMPONENT scan-view)

     

       221
       221
       -
          endforeach()

     

       222
       222
       -
        

     

       223
       223
       -
       diff --git a/utils/hmaptool/CMakeLists.txt b/utils/hmaptool/CMakeLists.txt

     

       224
       224
       -
       index 62f2de0cb15c..6aa66825b6ec 100644

     

       225
       225
       -
       --- a/utils/hmaptool/CMakeLists.txt

     

       226
       226
       -
       +++ b/utils/hmaptool/CMakeLists.txt

     

       227
       227
       -
       @@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM

     

       228
       228
       -
        

     

       229
       229
       -
        list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})

     

       230
       230
       -
        install(PROGRAMS ${CLANG_HMAPTOOL}

     

       231
       231
       -
       -        DESTINATION bin

     

       232
       232
       -
       +        DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       233
       233
       -
                COMPONENT hmaptool)

     

       234
       234
       -
        

     

       235
       235
       -
        add_custom_target(hmaptool ALL DEPENDS ${Depends})

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

-78

pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch

···

       1
       1
       -
       --- b/include/clang/Basic/TargetInfo.h

     

       2
       2
       -
       +++ a/include/clang/Basic/TargetInfo.h

     

       3
       3
       -
       @@ -612,8 +612,8 @@

     

       4
       4
       -
          }

     

       5
       5
       -
        

     

       6
       6
       -
          /// Return the largest alignment for which a suitably-sized allocation with

     

       7
       7
       -
       +  /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned

     

       8
       8
       -
       +  /// pointer.

     

       9
       9
       -
       -  /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a

     

       10
       10
       -
       -  /// correctly-aligned pointer.

     

       11
       11
       -
          unsigned getNewAlign() const {

     

       12
       12
       -
            return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);

     

       13
       13
       -
          }

     

       14
       14
       -
       --- b/lib/CodeGen/CGCall.cpp

     

       15
       15
       -
       +++ a/lib/CodeGen/CGCall.cpp

     

       16
       16
       -
       @@ -2048,24 +2048,6 @@

     

       17
       17
       -
              // allows it to work on indirect virtual function calls.

     

       18
       18
       -
              if (AttrOnCallSite && TargetDecl->hasAttr<NoMergeAttr>())

     

       19
       19
       -
                FuncAttrs.addAttribute(llvm::Attribute::NoMerge);

     

       20
       20
       -
       -

     

       21
       21
       -
       -      // Add known guaranteed alignment for allocation functions.

     

       22
       22
       -
       -      if (unsigned BuiltinID = Fn->getBuiltinID()) {

     

       23
       23
       -
       -        switch (BuiltinID) {

     

       24
       24
       -
       -        case Builtin::BIaligned_alloc:

     

       25
       25
       -
       -        case Builtin::BIcalloc:

     

       26
       26
       -
       -        case Builtin::BImalloc:

     

       27
       27
       -
       -        case Builtin::BImemalign:

     

       28
       28
       -
       -        case Builtin::BIrealloc:

     

       29
       29
       -
       -        case Builtin::BIstrdup:

     

       30
       30
       -
       -        case Builtin::BIstrndup:

     

       31
       31
       -
       -          RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /

     

       32
       32
       -
       -                                    Context.getTargetInfo().getCharWidth());

     

       33
       33
       -
       -          break;

     

       34
       34
       -
       -        default:

     

       35
       35
       -
       -          break;

     

       36
       36
       -
       -        }

     

       37
       37
       -
       -      }

     

       38
       38
       -
            }

     

       39
       39
       -
        

     

       40
       40
       -
            // 'const', 'pure' and 'noalias' attributed functions are also nounwind.

     

       41
       41
       -
       --- b/test/CodeGen/alloc-fns-alignment.c

     

       42
       42
       -
       +++ /dev/null

     

       43
       43
       -
       @@ -1,35 +0,0 @@

     

       44
       44
       -
       -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

     

       45
       45
       -
       -// RUN: %clang_cc1 -triple x86_64-windows-msvc      -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

     

       46
       46
       -
       -// RUN: %clang_cc1 -triple i386-apple-darwin        -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16

     

       47
       47
       -
       -// RUN: %clang_cc1 -triple i386-unknown-linux-gnu   -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN8

     

       48
       48
       -
       -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-malloc  -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-MALLOC

     

       49
       49
       -
       -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-calloc  -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-CALLOC

     

       50
       50
       -
       -// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-realloc -emit-llvm < %s  | FileCheck %s --check-prefix=NOBUILTIN-REALLOC

     

       51
       51
       -
       -

     

       52
       52
       -
       -typedef __SIZE_TYPE__ size_t;

     

       53
       53
       -
       -

     

       54
       54
       -
       -void *malloc(size_t);

     

       55
       55
       -
       -void *calloc(size_t, size_t);

     

       56
       56
       -
       -void *realloc(void *, size_t);

     

       57
       57
       -
       -

     

       58
       58
       -
       -void *malloc_test(size_t n) {

     

       59
       59
       -
       -  return malloc(n);

     

       60
       60
       -
       -}

     

       61
       61
       -
       -

     

       62
       62
       -
       -void *calloc_test(size_t n) {

     

       63
       63
       -
       -  return calloc(1, n);

     

       64
       64
       -
       -}

     

       65
       65
       -
       -

     

       66
       66
       -
       -void *raalloc_test(void *p, size_t n) {

     

       67
       67
       -
       -  return realloc(p, n);

     

       68
       68
       -
       -}

     

       69
       69
       -
       -

     

       70
       70
       -
       -// ALIGN16: align 16 i8* @malloc

     

       71
       71
       -
       -// ALIGN16: align 16 i8* @calloc

     

       72
       72
       -
       -// ALIGN16: align 16 i8* @realloc

     

       73
       73
       -
       -// ALIGN8: align 8 i8* @malloc

     

       74
       74
       -
       -// ALIGN8: align 8 i8* @calloc

     

       75
       75
       -
       -// ALIGN8: align 8 i8* @realloc

     

       76
       76
       -
       -// NOBUILTIN-MALLOC: declare i8* @malloc

     

       77
       77
       -
       -// NOBUILTIN-CALLOC: declare i8* @calloc

     

       78
       78
       -
       -// NOBUILTIN-REALLOC: declare i8* @realloc

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

pkgs/development/compilers/llvm/13/compiler-rt/armv7l.patch pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch

pkgs/development/compilers/llvm/13/compiler-rt/codesign.patch pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch

pkgs/development/compilers/llvm/13/compiler-rt/darwin-targetconditionals.patch pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch

-129

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

···

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

     

       2
       2
       -
       index b44ad2c2118e..d42f5664d448 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.13.4)

     

       6
       6
       -
        # Check if compiler-rt is built as a standalone project.

     

       7
       7
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)

     

       8
       8
       -
          project(CompilerRT C CXX ASM)

     

       9
       9
       -
       +  include(GNUInstallDirs)

     

       10
       10
       -
          set(COMPILER_RT_STANDALONE_BUILD TRUE)

     

       11
       11
       -
          set_property(GLOBAL PROPERTY USE_FOLDERS ON)

     

       12
       12
       -
        endif()

     

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

     

       14
       14
       -
       index 361538a58e47..f0d8d9ab80f1 100644

     

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

     

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

     

       17
       17
       -
       @@ -495,7 +495,7 @@ macro(add_compiler_rt_resource_file target_name file_name component)

     

       18
       18
       -
          add_custom_target(${target_name} DEPENDS ${dst_file})

     

       19
       19
       -
          # Install in Clang resource directory.

     

       20
       20
       -
          install(FILES ${file_name}

     

       21
       21
       -
       -    DESTINATION ${COMPILER_RT_INSTALL_PATH}/share

     

       22
       22
       -
       +    DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR}

     

       23
       23
       -
            COMPONENT ${component})

     

       24
       24
       -
          add_dependencies(${component} ${target_name})

     

       25
       25
       -
        

     

       26
       26
       -
       @@ -512,7 +512,7 @@ macro(add_compiler_rt_script name)

     

       27
       27
       -
          add_custom_target(${name} DEPENDS ${dst})

     

       28
       28
       -
          install(FILES ${dst}

     

       29
       29
       -
            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE

     

       30
       30
       -
       -    DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin)

     

       31
       31
       -
       +    DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR})

     

       32
       32
       -
        endmacro(add_compiler_rt_script src name)

     

       33
       33
       -
        

     

       34
       34
       -
        # Builds custom version of libc++ and installs it in <prefix>.

     

       35
       35
       -
       diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake

     

       36
       36
       -
       index 456a8dcda59f..7a09e74c7c79 100644

     

       37
       37
       -
       --- a/cmake/Modules/CompilerRTDarwinUtils.cmake

     

       38
       38
       -
       +++ b/cmake/Modules/CompilerRTDarwinUtils.cmake

     

       39
       39
       -
       @@ -508,7 +508,7 @@ macro(darwin_add_embedded_builtin_libraries)

     

       40
       40
       -
            set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR

     

       41
       41
       -
              ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded)

     

       42
       42
       -
            set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR

     

       43
       43
       -
       -      ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded)

     

       44
       44
       -
       +      ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded)

     

       45
       45
       -
              

     

       46
       46
       -
            set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi")

     

       47
       47
       -
            set(CFLAGS_i386 "-march=pentium")

     

       48
       48
       -
       diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake

     

       49
       49
       -
       index f61d487e93a0..f1f46fb9599c 100644

     

       50
       50
       -
       --- a/cmake/Modules/CompilerRTUtils.cmake

     

       51
       51
       -
       +++ b/cmake/Modules/CompilerRTUtils.cmake

     

       52
       52
       -
       @@ -378,7 +378,7 @@ endfunction()

     

       53
       53
       -
        function(get_compiler_rt_install_dir arch install_dir)

     

       54
       54
       -
          if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       55
       55
       -
            get_compiler_rt_target(${arch} target)

     

       56
       56
       -
       -    set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE)

     

       57
       57
       -
       +    set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${target} PARENT_SCOPE)

     

       58
       58
       -
          else()

     

       59
       59
       -
            set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE)

     

       60
       60
       -
          endif()

     

       61
       61
       -
       diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake

     

       62
       62
       -
       index 1edab43e7c0d..1aac6b73ff82 100644

     

       63
       63
       -
       --- a/cmake/base-config-ix.cmake

     

       64
       64
       -
       +++ b/cmake/base-config-ix.cmake

     

       65
       65
       -
       @@ -65,11 +65,11 @@ if (LLVM_TREE_AVAILABLE)

     

       66
       66
       -
        else()

     

       67
       67
       -
            # Take output dir and install path from the user.

     

       68
       68
       -
          set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH

     

       69
       69
       -
       -    "Path where built compiler-rt libraries should be stored.")

     

       70
       70
       -
       +    "Path where built compiler-rt build artifacts should be stored.")

     

       71
       71
       -
          set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH

     

       72
       72
       -
            "Path where built compiler-rt executables should be stored.")

     

       73
       73
       -
       -  set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH

     

       74
       74
       -
       -    "Path where built compiler-rt libraries should be installed.")

     

       75
       75
       -
       +  set(COMPILER_RT_INSTALL_PATH "" CACHE PATH

     

       76
       76
       -
       +    "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.")

     

       77
       77
       -
          option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF)

     

       78
       78
       -
          option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF)

     

       79
       79
       -
          # Use a host compiler to compile/link tests.

     

       80
       80
       -
       @@ -97,7 +97,7 @@ else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)

     

       81
       81
       -
          set(COMPILER_RT_LIBRARY_OUTPUT_DIR

     

       82
       82
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR})

     

       83
       83
       -
          set(COMPILER_RT_LIBRARY_INSTALL_DIR

     

       84
       84
       -
       -    ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR})

     

       85
       85
       -
       +    ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR})

     

       86
       86
       -
        endif()

     

       87
       87
       -
        

     

       88
       88
       -
        if(APPLE)

     

       89
       89
       -
       diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt

     

       90
       90
       -
       index b00e8caa1ddd..0fe64e4862c9 100644

     

       91
       91
       -
       --- a/include/CMakeLists.txt

     

       92
       92
       -
       +++ b/include/CMakeLists.txt

     

       93
       93
       -
       @@ -69,22 +69,22 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")

     

       94
       94
       -
        install(FILES ${SANITIZER_HEADERS}

     

       95
       95
       -
          COMPONENT compiler-rt-headers

     

       96
       96
       -
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

     

       97
       97
       -
       -  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer)

     

       98
       98
       -
       +  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer)

     

       99
       99
       -
        # Install fuzzer headers.

     

       100
       100
       -
        install(FILES ${FUZZER_HEADERS}

     

       101
       101
       -
          COMPONENT compiler-rt-headers

     

       102
       102
       -
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

     

       103
       103
       -
       -  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/fuzzer)

     

       104
       104
       -
       +  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/fuzzer)

     

       105
       105
       -
        # Install xray headers.

     

       106
       106
       -
        install(FILES ${XRAY_HEADERS}

     

       107
       107
       -
          COMPONENT compiler-rt-headers

     

       108
       108
       -
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

     

       109
       109
       -
       -  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray)

     

       110
       110
       -
       +  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray)

     

       111
       111
       -
        # Install profile headers.

     

       112
       112
       -
        install(FILES ${PROFILE_HEADERS}

     

       113
       113
       -
          COMPONENT compiler-rt-headers

     

       114
       114
       -
          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

     

       115
       115
       -
       -  DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/profile)

     

       116
       116
       -
       +  DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/profile)

     

       117
       117
       -
        

     

       118
       118
       -
        if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.

     

       119
       119
       -
          add_custom_target(install-compiler-rt-headers

     

       120
       120
       -
       diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt

     

       121
       121
       -
       index a29de8deff1b..d39ff01613d2 100644

     

       122
       122
       -
       --- a/lib/dfsan/CMakeLists.txt

     

       123
       123
       -
       +++ b/lib/dfsan/CMakeLists.txt

     

       124
       124
       -
       @@ -57,4 +57,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename}

     

       125
       125
       -
                           DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt)

     

       126
       126
       -
        add_dependencies(dfsan dfsan_abilist)

     

       127
       127
       -
        install(FILES ${dfsan_abilist_filename}

     

       128
       128
       -
       -        DESTINATION ${COMPILER_RT_INSTALL_PATH}/share)

     

       129
       129
       -
       +        DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_DATADIR})

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

-36

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

···

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

     

       2
       2
       -
       index 81eddbc24879..e2afb2002150 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

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

     

       6
       6
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD)

     

       7
       7
       -
          project(libunwind LANGUAGES C CXX ASM)

     

       8
       8
       -
        

     

       9
       9
       -
       +  include(GNUInstallDirs)

     

       10
       10
       -
       +

     

       11
       11
       -
          set(PACKAGE_NAME libunwind)

     

       12
       12
       -
          set(PACKAGE_VERSION 13.0.0git)

     

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

     

       14
       14
       -
       @@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH

     

       15
       15
       -
        

     

       16
       16
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

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

     

       18
       18
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH

     

       19
       19
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH

     

       20
       20
       -
              "Path where built libunwind libraries should be installed.")

     

       21
       21
       -
          if(LIBCXX_LIBDIR_SUBDIR)

     

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

     

       23
       23
       -
       @@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       24
       24
       -
          endif()

     

       25
       25
       -
        elseif(LLVM_LIBRARY_OUTPUT_INTDIR)

     

       26
       26
       -
          set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})

     

       27
       27
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

     

       28
       28
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH

     

       29
       29
       -
              "Path where built libunwind libraries should be installed.")

     

       30
       30
       -
        else()

     

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

     

       32
       32
       -
       -  set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

     

       33
       33
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH

     

       34
       34
       -
              "Path where built libunwind libraries should be installed.")

     

       35
       35
       -
        endif()

     

       36
       36
       -

-68

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

···

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

     

       2
       2
       -
       index d4e561b50d8f..cfa5bdd79c2a 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

     

       6
       6
       -
          set(CMAKE_INCLUDE_CURRENT_DIR ON)

     

       7
       7
       -
          set(LLD_BUILT_STANDALONE TRUE)

     

       8
       8
       -
        

     

       9
       9
       -
       +  include(GNUInstallDirs)

     

       10
       10
       -
       +

     

       11
       11
       -
          find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary")

     

       12
       12
       -
          if(NOT LLVM_CONFIG_PATH)

     

       13
       13
       -
            message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")

     

       14
       14
       -
       @@ -179,7 +181,7 @@ include_directories(BEFORE

     

       15
       15
       -
        

     

       16
       16
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       17
       17
       -
          install(DIRECTORY include/

     

       18
       18
       -
       -    DESTINATION include

     

       19
       19
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       20
       20
       -
            FILES_MATCHING

     

       21
       21
       -
            PATTERN "*.h"

     

       22
       22
       -
            )

     

       23
       23
       -
       diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake

     

       24
       24
       -
       index 23df41312403..d62372c88de7 100644

     

       25
       25
       -
       --- a/cmake/modules/AddLLD.cmake

     

       26
       26
       -
       +++ b/cmake/modules/AddLLD.cmake

     

       27
       27
       -
       @@ -20,9 +20,9 @@ macro(add_lld_library name)

     

       28
       28
       -
            install(TARGETS ${name}

     

       29
       29
       -
              COMPONENT ${name}

     

       30
       30
       -
              ${export_to_lldtargets}

     

       31
       31
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       32
       32
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       33
       33
       -
       -      RUNTIME DESTINATION bin)

     

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

     

       35
       35
       -
       +      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}

     

       36
       36
       -
       +      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

     

       37
       37
       -
        

     

       38
       38
       -
            if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES)

     

       39
       39
       -
              add_llvm_install_targets(install-${name}

     

       40
       40
       -
       @@ -54,7 +54,7 @@ macro(add_lld_tool name)

     

       41
       41
       -
        

     

       42
       42
       -
            install(TARGETS ${name}

     

       43
       43
       -
              ${export_to_lldtargets}

     

       44
       44
       -
       -      RUNTIME DESTINATION bin

     

       45
       45
       -
       +      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       46
       46
       -
              COMPONENT ${name})

     

       47
       47
       -
        

     

       48
       48
       -
            if(NOT CMAKE_CONFIGURATION_TYPES)

     

       49
       49
       -
       @@ -69,5 +69,5 @@ endmacro()

     

       50
       50
       -
        macro(add_lld_symlink name dest)

     

       51
       51
       -
          add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE)

     

       52
       52
       -
          # Always generate install targets

     

       53
       53
       -
       -  llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE)

     

       54
       54
       -
       +  llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE)

     

       55
       55
       -
        endmacro()

     

       56
       56
       -
       diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt

     

       57
       57
       -
       index 5cff736ff57f..64e775c771b9 100644

     

       58
       58
       -
       --- a/tools/lld/CMakeLists.txt

     

       59
       59
       -
       +++ b/tools/lld/CMakeLists.txt

     

       60
       60
       -
       @@ -21,7 +21,7 @@ target_link_libraries(lld

     

       61
       61
       -
          )

     

       62
       62
       -
        

     

       63
       63
       -
        install(TARGETS lld

     

       64
       64
       -
       -  RUNTIME DESTINATION bin)

     

       65
       65
       -
       +  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

     

       66
       66
       -
        

     

       67
       67
       -
        if(NOT LLD_SYMLINKS_TO_CREATE)

     

       68
       68
       -
          set(LLD_SYMLINKS_TO_CREATE

-110

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

···

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

     

       2
       2
       -
       index b5633e21c56a..f2f1035e9238 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

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

     

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

     

       7
       7
       -
        # using LLVM as an external library.

     

       8
       8
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

     

       9
       9
       -
       +  include(GNUInstallDirs)

     

       10
       10
       -
       +

     

       11
       11
       -
          project(lldb)

     

       12
       12
       -
          include(LLDBStandalone)

     

       13
       13
       -
        

     

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

     

       15
       15
       -
       index 4ed5c647c5d2..89f96e710d55 100644

     

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

     

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

     

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

     

       19
       19
       -
          endif()

     

       20
       20
       -
        

     

       21
       21
       -
          if(PARAM_SHARED)

     

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

     

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

     

       24
       24
       -
            if(PARAM_INSTALL_PREFIX)

     

       25
       25
       -
              set(install_dest ${PARAM_INSTALL_PREFIX})

     

       26
       26
       -
            endif()

     

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

     

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

     

       29
       29
       -
       -      RUNTIME DESTINATION bin

     

       30
       30
       -
       +      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

     

       31
       31
       -
              LIBRARY DESTINATION ${install_dest}

     

       32
       32
       -
              ARCHIVE DESTINATION ${install_dest}

     

       33
       33
       -
              FRAMEWORK DESTINATION ${install_dest})

     

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

     

       35
       35
       -
       index 2fdf1502d055..37364341ff8b 100644

     

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

     

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

     

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

     

       39
       39
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       40
       40
       -
          install(DIRECTORY include/

     

       41
       41
       -
            COMPONENT lldb-headers

     

       42
       42
       -
       -    DESTINATION include

     

       43
       43
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       44
       44
       -
            FILES_MATCHING

     

       45
       45
       -
            PATTERN "*.h"

     

       46
       46
       -
            PATTERN ".cmake" EXCLUDE

     

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

     

       48
       48
       -
        

     

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

     

       50
       50
       -
            COMPONENT lldb-headers

     

       51
       51
       -
       -    DESTINATION include

     

       52
       52
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       53
       53
       -
            FILES_MATCHING

     

       54
       54
       -
            PATTERN "*.h"

     

       55
       55
       -
            PATTERN ".cmake" EXCLUDE

     

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

     

       57
       57
       -
       index 734167e51bc5..f95761b5df58 100644

     

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

     

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

     

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

     

       61
       61
       -
        endif()

     

       62
       62
       -
        

     

       63
       63
       -
        install(TARGETS lldbIntelFeatures

     

       64
       64
       -
       -  LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

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

     

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

     

       67
       67
       -
       index 752113b..010f187 100644

     

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

     

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

     

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

     

       71
       71
       -
       

     

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

     

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

     

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

     

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

     

       76
       76
       -
        if(WIN32 OR CYGWIN)

     

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

     

       78
       78
       -
          set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})

     

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

     

       80
       80
       -
       index b5633e2..86e4738 100644

     

       81
       81
       -
       --- a/CMakeLists.txt

     

       82
       82
       -
       +++ b/CMakeLists.txt

     

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

     

       84
       84
       -
          if(LLDB_BUILD_FRAMEWORK)

     

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

     

       86
       86
       -
          else()

     

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

     

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

     

       89
       89
       -
          endif()

     

       90
       90
       -
          get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR)

     

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

     

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

     

       93
       93
       -
       index b5633e2..86e4738 100644

     

       94
       94
       -
       --- a/source/API/CMakeLists.txt	2024-05-30 21:38:39.829955586 -0700

     

       95
       95
       -
       +++ b/source/API/CMakeLists.txt	2024-05-30 21:38:48.015673758 -0700

     

       96
       96
       -
       @@ -112,14 +112,6 @@

     

       97
       97
       -
          ${option_install_prefix}

     

       98
       98
       -
        )

     

       99
       99
       -
        

     

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

     

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

     

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

     

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

     

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

     

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

     

       106
       106
       -
       -endif()

     

       107
       107
       -
       -

     

       108
       108
       -
        if(Python3_RPATH)

     

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

     

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

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

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

-381

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

···

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

     

       2
       2
       -
       index 135036f509d2..265c36f8211b 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

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

     

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

     

       7
       7
       -
        endif()

     

       8
       8
       -
        

     

       9
       9
       -
       +include(GNUInstallDirs)

     

       10
       10
       -
       +

     

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

     

       12
       12
       -
        

     

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

     

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

     

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

     

       16
       16
       -
        mark_as_advanced(LLVM_TOOLS_INSTALL_DIR)

     

       17
       17
       -
        

     

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

     

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

     

       20
       20
       -
        mark_as_advanced(LLVM_UTILS_INSTALL_DIR)

     

       21
       21
       -
        

     

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

     

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

     

       24
       24
       -
       +

     

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

     

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

     

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

     

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

     

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

     

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

     

       31
       31
       -
        

     

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

     

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

     

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

     

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

     

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

     

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

     

       38
       38
       -
        

     

       39
       39
       -
        option (LLVM_BUILD_EXTERNAL_COMPILER_RT

     

       40
       40
       -
       @@ -1048,7 +1054,7 @@ endif()

     

       41
       41
       -
        

     

       42
       42
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

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

     

       44
       44
       -
       -    DESTINATION include

     

       45
       45
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       46
       46
       -
            COMPONENT llvm-headers

     

       47
       47
       -
            FILES_MATCHING

     

       48
       48
       -
            PATTERN "*.def"

     

       49
       49
       -
       @@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       50
       50
       -
            )

     

       51
       51
       -
        

     

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

     

       53
       53
       -
       -    DESTINATION include

     

       54
       54
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       55
       55
       -
            COMPONENT llvm-headers

     

       56
       56
       -
            FILES_MATCHING

     

       57
       57
       -
            PATTERN "*.def"

     

       58
       58
       -
       @@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       59
       59
       -
        

     

       60
       60
       -
          if (LLVM_INSTALL_MODULEMAPS)

     

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

     

       62
       62
       -
       -            DESTINATION include

     

       63
       63
       -
       +            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       64
       64
       -
                    COMPONENT llvm-headers

     

       65
       65
       -
                    FILES_MATCHING

     

       66
       66
       -
                    PATTERN "module.modulemap"

     

       67
       67
       -
                    )

     

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

     

       69
       69
       -
       -            DESTINATION include/llvm

     

       70
       70
       -
       +            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm

     

       71
       71
       -
                    COMPONENT llvm-headers

     

       72
       72
       -
                    RENAME "module.extern.modulemap"

     

       73
       73
       -
                    )

     

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

     

       75
       75
       -
       index 9c2b85374307..5531ceeb2eeb 100644

     

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

     

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

     

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

     

       79
       79
       -
              get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella})

     

       80
       80
       -
              install(TARGETS ${name}

     

       81
       81
       -
                      ${export_to_llvmexports}

     

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

     

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

     

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

     

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

     

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

     

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

     

       88
       88
       -
        

     

       89
       89
       -
              if (NOT LLVM_ENABLE_IDE)

     

       90
       90
       -
                add_llvm_install_targets(install-${name}

     

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

     

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

     

       93
       93
       -
              install(FILES

     

       94
       94
       -
                  ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake

     

       95
       95
       -
       -          DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}

     

       96
       96
       -
       +          DESTINATION ${LLVM_INSTALL_CMAKE_DIR}

     

       97
       97
       -
                  COMPONENT cmake-exports)

     

       98
       98
       -
        

     

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

     

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

     

       101
       101
       -
          endif()

     

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

     

       103
       103
       -
          if( LLVM_BUILD_EXAMPLES )

     

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

     

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

     

       106
       106
       -
          endif()

     

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

     

       108
       108
       -
        endmacro(add_llvm_example name)

     

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

     

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

     

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

     

       112
       112
       -
        

     

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

     

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

     

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

     

       116
       116
       -
            set(output_dir bin)

     

       117
       117
       -
          endif()

     

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

     

       119
       119
       -
        

     

       120
       120
       -
        endfunction()

     

       121
       121
       -
        

     

       122
       122
       -
       -function(llvm_install_symlink name dest)

     

       123
       123
       -
       +function(llvm_install_symlink name dest output_dir)

     

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

     

       125
       125
       -
          foreach(path ${CMAKE_MODULE_PATH})

     

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

     

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

     

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

     

       129
       129
       -
        

     

       130
       130
       -
          install(SCRIPT ${INSTALL_SYMLINK}

     

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

     

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

     

       133
       133
       -
                  COMPONENT ${component})

     

       134
       134
       -
        

     

       135
       135
       -
          if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)

     

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

     

       137
       137
       -
            endif()

     

       138
       138
       -
        

     

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

     

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

     

       141
       141
       -
       +      GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR)

     

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

     

       143
       143
       -
            endif()

     

       144
       144
       -
          endif()

     

       145
       145
       -
        endfunction()

     

       146
       146
       -
       @@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name)

     

       147
       147
       -
            # Since BUILD_SHARED_LIBS is only recommended for use by developers,

     

       148
       148
       -
            # hardcode the rpath to build/install lib dir first in this mode.

     

       149
       149
       -
            # FIXME: update this when there is better solution.

     

       150
       150
       -
       -    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       151
       151
       -
       +    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       152
       152
       -
          elseif(UNIX)

     

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

     

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

     

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

     

       156
       156
       -
              set_property(TARGET ${name} APPEND_STRING PROPERTY

     

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

     

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

     

       159
       159
       -
       index 554046b20edf..4d1ad980641e 100644

     

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

     

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

     

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

     

       163
       163
       -
          endforeach()

     

       164
       164
       -
        

     

       165
       165
       -
          if( APPLE )

     

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

     

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

     

       168
       168
       -
          elseif( UNIX )

     

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

     

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

     

       171
       171
       -
          endif()

     

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

     

       173
       173
       -
        

     

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

     

       175
       175
       -
       index e80c3b5c1cac..482f6d715ef5 100644

     

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

     

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

     

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

     

       179
       179
       -
                endif()

     

       180
       180
       -
              elseif (builder STREQUAL html)

     

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

     

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

     

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

     

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

     

       185
       185
       -
        

     

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

     

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

     

       188
       188
       -
       index 51b6a4fdc284..4adc2acfc074 100644

     

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

     

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

     

       191
       191
       -
       @@ -1,6 +1,6 @@

     

       192
       192
       -
        include(LLVMDistributionSupport)

     

       193
       193
       -
        

     

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

     

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

     

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

     

       197
       197
       -
        

     

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

     

       199
       199
       -
       @@ -109,13 +109,13 @@ foreach(p ${_count})

     

       200
       200
       -
          set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}

     

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

     

       202
       202
       -
        endforeach(p)

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       213
       213
       -
        

     

       214
       214
       -
        # Generate a default location for lit

     

       215
       215
       -
        if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)

     

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

     

       217
       217
       -
       index 3e6a2c9a2648..52e14d955c60 100644

     

       218
       218
       -
       --- a/cmake/modules/LLVMInstallSymlink.cmake

     

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

     

       220
       220
       -
       @@ -4,7 +4,7 @@

     

       221
       221
       -
        

     

       222
       222
       -
        function(install_symlink name target outdir)

     

       223
       223
       -
          set(DESTDIR $ENV{DESTDIR})

     

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

     

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

     

       226
       226
       -
        

     

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

     

       228
       228
       -
        

     

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

     

       230
       230
       -
       index f1ac2c7d4934..c6e1469b5e13 100644

     

       231
       231
       -
       --- a/docs/CMake.rst

     

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

     

       233
       233
       -
       @@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``.

     

       234
       234
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

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

     

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

     

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

     

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

     

       239
       239
       -
        

     

       240
       240
       -
        Rarely-used CMake variables

     

       241
       241
       -
        ---------------------------

     

       242
       242
       -
       @@ -551,8 +551,8 @@ LLVM-specific variables

     

       243
       243
       -
        

     

       244
       244
       -
        **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING

     

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

     

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

     

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

     

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

     

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

     

       250
       250
       -
        

     

       251
       251
       -
        **LLVM_LINK_LLVM_DYLIB**:BOOL

     

       252
       252
       -
          If enabled, tools will be linked with the libLLVM shared library. Defaults

     

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

     

       254
       254
       -
        

     

       255
       255
       -
        This file is available in two different locations.

     

       256
       256
       -
        

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       265
       265
       -
        

     

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

     

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

     

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

     

       269
       269
       -
       index bb96edb4b4bf..678c22fb43c8 100644

     

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

     

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

     

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

     

       273
       273
       -
            BUILDTREE_ONLY

     

       274
       274
       -
           )

     

       275
       275
       -
        

     

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

     

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

     

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

     

       279
       279
       -
        endif()

     

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

     

       281
       281
       -
       index b46319f24fc8..2feabd1954e4 100644

     

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

     

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

     

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

     

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

     

       286
       286
       -
        # header files into the build area.

     

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

     

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

     

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

     

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

     

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

     

       292
       292
       -
       index ebe5b73a5c65..70c497be12f5 100644

     

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

     

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

     

       295
       295
       -
       @@ -23,6 +23,10 @@

     

       296
       296
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       297
       297
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       298
       298
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

       299
       299
       -
       +#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@"

     

       300
       300
       -
       +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"

     

       301
       301
       -
       +#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       302
       302
       -
       +#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@"

     

       303
       303
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       304
       304
       -
        #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"

     

       305
       305
       -
        #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@"

     

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

     

       307
       307
       -
       index 1a2f04552d13..44fa7d3eec6b 100644

     

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

     

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

     

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

     

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

     

       312
       312
       -
          } else {

     

       313
       313
       -
            ActivePrefix = CurrentExecPrefix;

     

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

     

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

     

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

     

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

     

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

     

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

     

       320
       320
       -
       +    {

     

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

     

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

     

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

     

       324
       324
       -
       +    }

     

       325
       325
       -
       +    {

     

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

     

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

     

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

     

       329
       329
       -
       +    }

     

       330
       330
       -
       +    {

     

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

     

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

     

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

     

       334
       334
       -
       +    }

     

       335
       335
       -
       +    {

     

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

     

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

     

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

     

       339
       339
       -
       +    }

     

       340
       340
       -
            ActiveIncludeOption = "-I" + ActiveIncludeDir;

     

       341
       341
       -
          }

     

       342
       342
       -
        

     

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

     

       344
       344
       -
       index 0af29ad762c5..37b99b83e35c 100644

     

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

     

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

     

       347
       347
       -
       @@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN

     

       348
       348
       -
            ${SOURCES} DEPENDS intrinsics_gen)

     

       349
       349
       -
        

     

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

     

       351
       351
       -
       -  DESTINATION include/llvm-c

     

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

     

       353
       353
       -
          COMPONENT LTO)

     

       354
       354
       -
        

     

       355
       355
       -
        if (APPLE)

     

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

     

       357
       357
       -
       index ead73ec13a8f..250362021f17 100644

     

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

     

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

     

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

     

       361
       361
       -
        

     

       362
       362
       -
        foreach (file ${files})

     

       363
       363
       -
          install(PROGRAMS ${file}

     

       364
       364
       -
       -    DESTINATION share/opt-viewer

     

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

     

       366
       366
       -
            COMPONENT opt-viewer)

     

       367
       367
       -
        endforeach (file)

     

       368
       368
       -
        

     

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

     

       370
       370
       -
       index 865436247270..ce1daa62f6ab 100644

     

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

     

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

     

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

     

       374
       374
       -
          endif()

     

       375
       375
       -
          

     

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

     

       377
       377
       -
       -    DESTINATION include/llvm-c

     

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

     

       379
       379
       -
            COMPONENT Remarks)

     

       380
       380
       -
        

     

       381
       381
       -
          if (APPLE)

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

+9 -15

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

···

       23
       23
        
         inherit version;

     

       24
       24
        
       

     

       25
       25
        
         # Blank llvm dir just so relative path works

     

       26
       26
       -
         src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } (

     

       27
       27
       -
           ''

     

       28
       28
       -
             mkdir $out

     

       29
       29
       -
           ''

     

       30
       30
       -
           + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       31
       31
       -
             cp -r ${monorepoSrc}/cmake "$out"

     

       32
       32
       -
           ''

     

       33
       33
       -
           + ''

     

       34
       34
       -
             cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"

     

       35
       35
       -
             cp -r ${monorepoSrc}/third-party "$out"

     

       26
       26
       +
         src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } (''

     

       27
       27
       +
           mkdir $out

     

       28
       28
       +
           cp -r ${monorepoSrc}/cmake "$out"

     

       29
       29
       +
           cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"

     

       30
       30
       +
           cp -r ${monorepoSrc}/third-party "$out"

     

       36
       31
        
       

     

       37
       37
       -
             # BOLT re-runs tablegen against LLVM sources, so needs them available.

     

       38
       38
       -
             cp -r ${monorepoSrc}/llvm/ "$out"

     

       39
       39
       -
             chmod -R +w $out/llvm

     

       40
       40
       -
           ''

     

       41
       41
       -
         );

     

       32
       32
       +
           # BOLT re-runs tablegen against LLVM sources, so needs them available.

     

       33
       33
       +
           cp -r ${monorepoSrc}/llvm/ "$out"

     

       34
       34
       +
           chmod -R +w $out/llvm

     

       35
       35
       +
         '');

     

       42
       36
        
       

     

       43
       37
        
         sourceRoot = "${finalAttrs.src.name}/bolt";

     

       44
       38

+12 -30

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

···

       28
       28
        
       

     

       29
       29
        
           src =

     

       30
       30
        
             if monorepoSrc != null then

     

       31
       31
       -
               runCommand "clang-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       32
       32
       -
                 ''

     

       33
       33
       -
                   mkdir -p "$out"

     

       34
       34
       -
                 ''

     

       35
       35
       -
                 + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       36
       36
       -
                   cp -r ${monorepoSrc}/cmake "$out"

     

       37
       37
       -
                 ''

     

       38
       38
       -
                 + ''

     

       39
       39
       -
                   cp -r ${monorepoSrc}/clang "$out"

     

       40
       40
       -
                   cp -r ${monorepoSrc}/clang-tools-extra "$out"

     

       41
       41
       -
                 ''

     

       42
       42
       -
               )

     

       31
       31
       +
               runCommand "clang-src-${version}" { inherit (monorepoSrc) passthru; } (''

     

       32
       32
       +
                 mkdir -p "$out"

     

       33
       33
       +
                 cp -r ${monorepoSrc}/cmake "$out"

     

       34
       34
       +
                 cp -r ${monorepoSrc}/clang "$out"

     

       35
       35
       +
                 cp -r ${monorepoSrc}/clang-tools-extra "$out"

     

       36
       36
       +
               '')

     

       43
       37
        
             else

     

       44
       38
        
               src;

     

       45
       39
        
       

     
···

       58
       52
        
             # libraries. eg: `clang -munsupported hello.c -lc`

     

       59
       53
        
             ./clang-unsupported-option.patch

     

       60
       54
        
           ]

     

       61
       61
       -
           ++

     

       62
       62
       -
             lib.optional (lib.versions.major release_version == "13")

     

       63
       63
       -
               # Revert of https://reviews.llvm.org/D100879

     

       64
       64
       -
               # The malloc alignment assumption is incorrect for jemalloc and causes

     

       65
       65
       -
               # mis-compilation in firefox.

     

       66
       66
       -
               # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454

     

       67
       67
       -
               (getVersionFile "clang/revert-malloc-alignment-assumption.patch")

     

       68
       68
       -
           ++ lib.optional (lib.versionOlder release_version "17") (

     

       69
       69
       -
             if lib.versionAtLeast release_version "14" then

     

       70
       70
       -
               fetchpatch {

     

       71
       71
       -
                 name = "ignore-nostd-link.patch";

     

       72
       72
       -
                 url = "https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615.patch";

     

       73
       73
       -
                 relative = "clang";

     

       74
       74
       -
                 hash = "sha256-qzSAmoGY+7POkDhcGgQRPaNQ3+7PIcIc9cZuiE/eLkc=";

     

       75
       75
       -
               }

     

       76
       76
       -
             else

     

       77
       77
       -
               ./ignore-nostd-link-13.diff

     

       78
       78
       -
           )

     

       55
       55
       +
           ++ lib.optional (lib.versionOlder release_version "17") (fetchpatch {

     

       56
       56
       +
             name = "ignore-nostd-link.patch";

     

       57
       57
       +
             url = "https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615.patch";

     

       58
       58
       +
             relative = "clang";

     

       59
       59
       +
             hash = "sha256-qzSAmoGY+7POkDhcGgQRPaNQ3+7PIcIc9cZuiE/eLkc=";

     

       60
       60
       +
           })

     

       79
       61
        
           # Pass the correct path to libllvm

     

       80
       62
        
           ++ [

     

       81
       63
        
             (replaceVars

-57

pkgs/development/compilers/llvm/common/clang/ignore-nostd-link-13.diff

···

       1
       1
       -
       backported to clang-12 & clang-13 from https://github.com/llvm/llvm-project/commit/5b77e752dcd073846b89559d6c0e1a7699e58615

     

       2
       2
       -
       diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td

     

       3
       3
       -
       index a0cbcae..8797646 100644

     

       4
       4
       -
       --- a/include/clang/Driver/Options.td

     

       5
       5
       -
       +++ b/include/clang/Driver/Options.td

     

       6
       6
       -
       @@ -2931,7 +2931,7 @@ def headerpad__max__install__names : Joined<["-"], "headerpad_max_install_names"

     

       7
       7
       -
        def help : Flag<["-", "--"], "help">, Flags<[CC1Option,CC1AsOption, FC1Option,

     

       8
       8
       -
            FlangOption]>, HelpText<"Display available options">,

     

       9
       9
       -
            MarshallingInfoFlag<FrontendOpts<"ShowHelp">>;

     

       10
       10
       -
       -def ibuiltininc : Flag<["-"], "ibuiltininc">,

     

       11
       11
       -
       +def ibuiltininc : Flag<["-"], "ibuiltininc">, Group<clang_i_Group>,

     

       12
       12
       -
          HelpText<"Enable builtin #include directories even when -nostdinc is used "

     

       13
       13
       -
                   "before or after -ibuiltininc. "

     

       14
       14
       -
                   "Using -nobuiltininc after the option disables it">;

     

       15
       15
       -
       @@ -3641,10 +3641,11 @@ def no_cpp_precomp : Flag<["-"], "no-cpp-precomp">, Group<clang_ignored_f_Group>

     

       16
       16
       -
        def no_integrated_cpp : Flag<["-", "--"], "no-integrated-cpp">, Flags<[NoXarchOption]>;

     

       17
       17
       -
        def no_pedantic : Flag<["-", "--"], "no-pedantic">, Group<pedantic_Group>;

     

       18
       18
       -
        def no__dead__strip__inits__and__terms : Flag<["-"], "no_dead_strip_inits_and_terms">;

     

       19
       19
       -
       -def nobuiltininc : Flag<["-"], "nobuiltininc">, Flags<[CC1Option, CoreOption]>,

     

       20
       20
       -
       +def nobuiltininc : Flag<["-"], "nobuiltininc">, Flags<[CC1Option, CoreOption]>, Group<IncludePath_Group>,

     

       21
       21
       -
          HelpText<"Disable builtin #include directories">,

     

       22
       22
       -
          MarshallingInfoNegativeFlag<HeaderSearchOpts<"UseBuiltinIncludes">>;

     

       23
       23
       -
       -def nogpuinc : Flag<["-"], "nogpuinc">, HelpText<"Do not add include paths for CUDA/HIP and"

     

       24
       24
       -
       +def nogpuinc : Flag<["-"], "nogpuinc">, Group<IncludePath_Group>,

     

       25
       25
       -
       +  HelpText<"Do not add include paths for CUDA/HIP and"

     

       26
       26
       -
          " do not include the default CUDA/HIP wrapper headers">;

     

       27
       27
       -
        def : Flag<["-"], "nocudainc">, Alias<nogpuinc>;

     

       28
       28
       -
        def nogpulib : Flag<["-"], "nogpulib">,

     

       29
       29
       -
       @@ -3660,9 +3661,9 @@ def noprebind : Flag<["-"], "noprebind">;

     

       30
       30
       -
        def noprofilelib : Flag<["-"], "noprofilelib">;

     

       31
       31
       -
        def noseglinkedit : Flag<["-"], "noseglinkedit">;

     

       32
       32
       -
        def nostartfiles : Flag<["-"], "nostartfiles">, Group<Link_Group>;

     

       33
       33
       -
       -def nostdinc : Flag<["-"], "nostdinc">, Flags<[CoreOption]>;

     

       34
       34
       -
       -def nostdlibinc : Flag<["-"], "nostdlibinc">;

     

       35
       35
       -
       -def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>,

     

       36
       36
       -
       +def nostdinc : Flag<["-"], "nostdinc">, Flags<[CoreOption]>, Group<IncludePath_Group>;

     

       37
       37
       -
       +def nostdlibinc : Flag<["-"], "nostdlibinc">, Group<IncludePath_Group>;

     

       38
       38
       -
       +def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>, Group<IncludePath_Group>,

     

       39
       39
       -
          HelpText<"Disable standard #include directories for the C++ standard library">,

     

       40
       40
       -
          MarshallingInfoNegativeFlag<HeaderSearchOpts<"UseStandardCXXIncludes">>;

     

       41
       41
       -
        def nostdlib : Flag<["-"], "nostdlib">, Group<Link_Group>;

     

       42
       42
       -
       diff --git a/test/Driver/linker-opts.c b/test/Driver/linker-opts.c

     

       43
       43
       -
       index e1673f7..b9beb91 100644

     

       44
       44
       -
       --- a/test/Driver/linker-opts.c

     

       45
       45
       -
       +++ b/test/Driver/linker-opts.c

     

       46
       46
       -
       @@ -16,9 +16,8 @@

     

       47
       47
       -
        //

     

       48
       48
       -
        // Make sure that we don't warn on unused compiler arguments.

     

       49
       49
       -
        // RUN: %clang -Xclang -I. -x c %s -c -o %t/tmp.o

     

       50
       50
       -
       -// RUN: %clang -Xclang -I. %t/tmp.o -o %t/tmp -### 2>&1 | FileCheck %s --check-prefix=NO-UNUSED

     

       51
       51
       -
       -// NO-UNUSED-NOT: warning:{{.*}}unused

     

       52
       52
       -
       -//

     

       53
       53
       -
       +// RUN: %clang -### -I. -ibuiltininc -nobuiltininc -nostdinc -nostdinc++ -nostdlibinc -nogpuinc %t/tmp.o -o /dev/null 2>&1 | FileCheck /dev/null --implicit-check-not=warning:

     

       54
       54
       -
       +

     

       55
       55
       -
        // Make sure that we do warn in other cases.

     

       56
       56
       -
        // RUN: %clang %s -lfoo -c -o %t/tmp2.o -### 2>&1 | FileCheck %s --check-prefix=UNUSED

     

       57
       57
       -
        // UNUSED: warning:{{.*}}unused

+1 -1

pkgs/development/compilers/llvm/common/common-let.nix

···

       32
       32
        
             ++ lib.platforms.wasi

     

       33
       33
        
             ++ lib.platforms.x86

     

       34
       34
        
             ++ lib.platforms.riscv

     

       35
       35
       -
             ++ lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k

     

       35
       35
       +
             ++ lib.platforms.m68k

     

       36
       36
        
             ++ lib.optionals (lib.versionAtLeast release_version "16") lib.platforms.loongarch64;

     

       37
       37
        
         };

     

       38
       38

+1 -16

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

···

       58
       58
        
             runCommand "compiler-rt-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       59
       59
        
               ''

     

       60
       60
        
                 mkdir -p "$out"

     

       61
       61
       -
               ''

     

       62
       62
       -
               + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       63
       61
        
                 cp -r ${monorepoSrc}/cmake "$out"

     

       64
       62
        
               ''

     

       65
       63
        
               + lib.optionalString (lib.versionAtLeast release_version "21") ''

     
···

       84
       82
        
             # Fix build on armv6l

     

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

     

       86
       84
        
           ]

     

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

     

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

     

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

     

       89
       87
        
           )

     

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

     
···

       169
       167
        
           (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")

     

       170
       168
        
           (lib.cmakeBool "COMPILER_RT_USE_BUILTINS_LIBRARY" true)

     

       171
       169
        
         ]

     

       172
       172
       -
         ++

     

       173
       173
       -
           lib.optionals

     

       174
       174
       -
             ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13"))

     

       175
       175
       -
             [

     

       176
       176
       -
               (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)

     

       177
       177
       -
             ]

     

       178
       170
        
         ++ lib.optionals (useLLVM && haveLibc) [

     

       179
       171
        
           (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" true)

     

       180
       172
        
           (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" true)

     
···

       265
       257
        
               ''

     

       266
       258
        
             )

     

       267
       259
        
           )

     

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

     

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

     

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

     

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

     

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

     

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

     

       274
       274
       -
           ''

     

       275
       260
        
           +

     

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

     

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

+110 -188

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

···

       273
       273
        
       

     

       274
       274
        
             bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };

     

       275
       275
        
       

     

       276
       276
       -
             clangUseLLVM = wrapCCWith (

     

       277
       277
       -
               rec {

     

       278
       278
       -
                 cc = tools.clang-unwrapped;

     

       279
       279
       -
                 libcxx = targetLlvmLibraries.libcxx;

     

       280
       280
       -
                 bintools = bintools';

     

       281
       281
       -
                 extraPackages = [

     

       282
       282
       -
                   targetLlvmLibraries.compiler-rt

     

       283
       283
       -
                 ]

     

       284
       284
       -
                 ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [

     

       285
       285
       -
                   targetLlvmLibraries.libunwind

     

       286
       286
       -
                 ];

     

       287
       287
       -
                 extraBuildCommands =

     

       288
       288
       -
                   lib.optionalString (lib.versions.major metadata.release_version == "13") (

     

       289
       289
       -
                     ''

     

       290
       290
       -
                       echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags

     

       291
       291
       -
                       echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags

     

       292
       292
       -
                     ''

     

       293
       293
       -
                     + lib.optionalString (!stdenv.targetPlatform.isWasm) ''

     

       294
       294
       -
                       echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

     

       295
       295
       -
                       echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags

     

       296
       296
       -
                     ''

     

       297
       297
       -
                     + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

     

       298
       298
       -
                       echo "-lunwind" >> $out/nix-support/cc-ldflags

     

       299
       299
       -
                     ''

     

       300
       300
       -
                     + lib.optionalString stdenv.targetPlatform.isWasm ''

     

       301
       301
       -
                       echo "-fno-exceptions" >> $out/nix-support/cc-cflags

     

       302
       302
       -
                     ''

     

       303
       303
       -
                   )

     

       304
       304
       -
                   + mkExtraBuildCommands cc;

     

       305
       305
       -
               }

     

       306
       306
       -
               // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {

     

       307
       307
       -
                 nixSupport.cc-cflags = [

     

       308
       308
       -
                   "-rtlib=compiler-rt"

     

       309
       309
       -
                   "-Wno-unused-command-line-argument"

     

       310
       310
       -
                   "-B${targetLlvmLibraries.compiler-rt}/lib"

     

       311
       311
       -
                 ]

     

       312
       312
       -
                 ++ lib.optional (

     

       313
       313
       -
                   !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       314
       314
       -
                 ) "--unwindlib=libunwind"

     

       315
       315
       -
                 ++ lib.optional (

     

       316
       316
       -
                   !stdenv.targetPlatform.isWasm

     

       317
       317
       -
                   && !stdenv.targetPlatform.isFreeBSD

     

       318
       318
       -
                   && stdenv.targetPlatform.useLLVM or false

     

       319
       319
       -
                 ) "-lunwind"

     

       320
       320
       -
                 ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       321
       321
       -
                 nixSupport.cc-ldflags = lib.optionals (

     

       322
       322
       -
                   !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       323
       323
       -
                 ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       324
       324
       -
               }

     

       325
       325
       -
             );

     

       276
       276
       +
             clangUseLLVM = wrapCCWith rec {

     

       277
       277
       +
               cc = tools.clang-unwrapped;

     

       278
       278
       +
               libcxx = targetLlvmLibraries.libcxx;

     

       279
       279
       +
               bintools = bintools';

     

       280
       280
       +
               extraPackages = [

     

       281
       281
       +
                 targetLlvmLibraries.compiler-rt

     

       282
       282
       +
               ]

     

       283
       283
       +
               ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [

     

       284
       284
       +
                 targetLlvmLibraries.libunwind

     

       285
       285
       +
               ];

     

       286
       286
       +
               extraBuildCommands = mkExtraBuildCommands cc;

     

       287
       287
       +
               nixSupport.cc-cflags = [

     

       288
       288
       +
                 "-rtlib=compiler-rt"

     

       289
       289
       +
                 "-Wno-unused-command-line-argument"

     

       290
       290
       +
                 "-B${targetLlvmLibraries.compiler-rt}/lib"

     

       291
       291
       +
               ]

     

       292
       292
       +
               ++ lib.optional (

     

       293
       293
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       294
       294
       +
               ) "--unwindlib=libunwind"

     

       295
       295
       +
               ++ lib.optional (

     

       296
       296
       +
                 !stdenv.targetPlatform.isWasm

     

       297
       297
       +
                 && !stdenv.targetPlatform.isFreeBSD

     

       298
       298
       +
                 && stdenv.targetPlatform.useLLVM or false

     

       299
       299
       +
               ) "-lunwind"

     

       300
       300
       +
               ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       301
       301
       +
               nixSupport.cc-ldflags = lib.optionals (

     

       302
       302
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       303
       303
       +
               ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       304
       304
       +
             };

     

       326
       305
        
       

     

       327
       327
       -
             clangWithLibcAndBasicRtAndLibcxx = wrapCCWith (

     

       328
       328
       -
               rec {

     

       329
       329
       -
                 cc = tools.clang-unwrapped;

     

       330
       330
       -
                 libcxx = targetLlvmLibraries.libcxx;

     

       331
       331
       -
                 bintools = bintools';

     

       332
       332
       -
                 extraPackages = [

     

       333
       333
       -
                   targetLlvmLibraries.compiler-rt-no-libc

     

       334
       334
       -
                 ]

     

       335
       335
       -
                 ++

     

       336
       336
       -
                   lib.optionals

     

       337
       337
       -
                     (

     

       338
       338
       -
                       !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       339
       339
       -
                     )

     

       340
       340
       -
                     [

     

       341
       341
       -
                       targetLlvmLibraries.libunwind

     

       342
       342
       -
                     ];

     

       343
       343
       -
                 extraBuildCommands =

     

       344
       344
       -
                   lib.optionalString (lib.versions.major metadata.release_version == "13") (

     

       345
       345
       -
                     ''

     

       346
       346
       -
                       echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags

     

       347
       347
       -
                       echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags

     

       348
       348
       -
                     ''

     

       349
       349
       -
                     + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isDarwin) ''

     

       350
       350
       -
                       echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

     

       351
       351
       -
                       echo "-L${targetLlvmLibraries.libunwind}/lib" >> $out/nix-support/cc-ldflags

     

       352
       352
       -
                     ''

     

       353
       353
       -
                     + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

     

       354
       354
       -
                       echo "-lunwind" >> $out/nix-support/cc-ldflags

     

       355
       355
       -
                     ''

     

       356
       356
       -
                     + lib.optionalString stdenv.targetPlatform.isWasm ''

     

       357
       357
       -
                       echo "-fno-exceptions" >> $out/nix-support/cc-cflags

     

       358
       358
       -
                     ''

     

       306
       306
       +
             clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {

     

       307
       307
       +
               cc = tools.clang-unwrapped;

     

       308
       308
       +
               libcxx = targetLlvmLibraries.libcxx;

     

       309
       309
       +
               bintools = bintools';

     

       310
       310
       +
               extraPackages = [

     

       311
       311
       +
                 targetLlvmLibraries.compiler-rt-no-libc

     

       312
       312
       +
               ]

     

       313
       313
       +
               ++

     

       314
       314
       +
                 lib.optionals

     

       315
       315
       +
                   (

     

       316
       316
       +
                     !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       359
       317
        
                   )

     

       360
       360
       -
                   + mkExtraBuildCommandsBasicRt cc;

     

       361
       361
       -
               }

     

       362
       362
       -
               // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {

     

       363
       363
       -
                 nixSupport.cc-cflags = [

     

       364
       364
       -
                   "-rtlib=compiler-rt"

     

       365
       365
       -
                   "-Wno-unused-command-line-argument"

     

       366
       366
       -
                   "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       367
       367
       -
                 ]

     

       368
       368
       -
                 ++ lib.optional (

     

       369
       369
       -
                   !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       370
       370
       -
                 ) "--unwindlib=libunwind"

     

       371
       371
       -
                 ++ lib.optional (

     

       372
       372
       -
                   !stdenv.targetPlatform.isWasm

     

       373
       373
       -
                   && !stdenv.targetPlatform.isFreeBSD

     

       374
       374
       -
                   && stdenv.targetPlatform.useLLVM or false

     

       375
       375
       -
                 ) "-lunwind"

     

       376
       376
       -
                 ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       377
       377
       -
                 nixSupport.cc-ldflags = lib.optionals (

     

       378
       378
       -
                   !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       379
       379
       -
                 ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       380
       380
       -
               }

     

       381
       381
       -
             );

     

       318
       318
       +
                   [

     

       319
       319
       +
                     targetLlvmLibraries.libunwind

     

       320
       320
       +
                   ];

     

       321
       321
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       322
       322
       +
               nixSupport.cc-cflags = [

     

       323
       323
       +
                 "-rtlib=compiler-rt"

     

       324
       324
       +
                 "-Wno-unused-command-line-argument"

     

       325
       325
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       326
       326
       +
               ]

     

       327
       327
       +
               ++ lib.optional (

     

       328
       328
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       329
       329
       +
               ) "--unwindlib=libunwind"

     

       330
       330
       +
               ++ lib.optional (

     

       331
       331
       +
                 !stdenv.targetPlatform.isWasm

     

       332
       332
       +
                 && !stdenv.targetPlatform.isFreeBSD

     

       333
       333
       +
                 && stdenv.targetPlatform.useLLVM or false

     

       334
       334
       +
               ) "-lunwind"

     

       335
       335
       +
               ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       336
       336
       +
               nixSupport.cc-ldflags = lib.optionals (

     

       337
       337
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       338
       338
       +
               ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       339
       339
       +
             };

     

       382
       340
        
       

     

       383
       383
       -
             clangWithLibcAndBasicRt = wrapCCWith (

     

       384
       384
       -
               rec {

     

       385
       385
       -
                 cc = tools.clang-unwrapped;

     

       386
       386
       -
                 libcxx = null;

     

       387
       387
       -
                 bintools = bintools';

     

       388
       388
       -
                 extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       389
       389
       -
                 extraBuildCommands =

     

       390
       390
       -
                   lib.optionalString (lib.versions.major metadata.release_version == "13") ''

     

       391
       391
       -
                     echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags

     

       392
       392
       -
                     echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags

     

       393
       393
       -
                     echo "-nostdlib++" >> $out/nix-support/cc-cflags

     

       394
       394
       -
                   ''

     

       395
       395
       -
                   + mkExtraBuildCommandsBasicRt cc;

     

       396
       396
       -
               }

     

       397
       397
       -
               // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {

     

       398
       398
       -
                 nixSupport.cc-cflags = [

     

       399
       399
       -
                   "-rtlib=compiler-rt"

     

       400
       400
       -
                   "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       401
       401
       -
                   "-nostdlib++"

     

       402
       402
       -
                 ]

     

       403
       403
       -
                 ++ lib.optional (

     

       404
       404
       -
                   lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       405
       405
       -
                 ) "-fno-exceptions";

     

       406
       406
       -
               }

     

       407
       407
       -
             );

     

       341
       341
       +
             clangWithLibcAndBasicRt = wrapCCWith rec {

     

       342
       342
       +
               cc = tools.clang-unwrapped;

     

       343
       343
       +
               libcxx = null;

     

       344
       344
       +
               bintools = bintools';

     

       345
       345
       +
               extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       346
       346
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       347
       347
       +
               nixSupport.cc-cflags = [

     

       348
       348
       +
                 "-rtlib=compiler-rt"

     

       349
       349
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       350
       350
       +
                 "-nostdlib++"

     

       351
       351
       +
               ]

     

       352
       352
       +
               ++ lib.optional (

     

       353
       353
       +
                 lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       354
       354
       +
               ) "-fno-exceptions";

     

       355
       355
       +
             };

     

       408
       356
        
       

     

       409
       409
       -
             clangNoLibcWithBasicRt = wrapCCWith (

     

       410
       410
       -
               rec {

     

       411
       411
       -
                 cc = tools.clang-unwrapped;

     

       412
       412
       -
                 libcxx = null;

     

       413
       413
       -
                 bintools = bintoolsNoLibc';

     

       414
       414
       -
                 extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       415
       415
       -
                 extraBuildCommands =

     

       416
       416
       -
                   lib.optionalString (lib.versions.major metadata.release_version == "13") ''

     

       417
       417
       -
                     echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags

     

       418
       418
       -
                     echo "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib" >> $out/nix-support/cc-cflags

     

       419
       419
       -
                   ''

     

       420
       420
       -
                   + mkExtraBuildCommandsBasicRt cc;

     

       421
       421
       -
               }

     

       422
       422
       -
               // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {

     

       423
       423
       -
                 nixSupport.cc-cflags = [

     

       424
       424
       -
                   "-rtlib=compiler-rt"

     

       425
       425
       -
                   "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       426
       426
       -
                 ]

     

       427
       427
       -
                 ++ lib.optional (

     

       428
       428
       -
                   lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       429
       429
       -
                 ) "-fno-exceptions";

     

       430
       430
       -
               }

     

       431
       431
       -
             );

     

       357
       357
       +
             clangNoLibcWithBasicRt = wrapCCWith rec {

     

       358
       358
       +
               cc = tools.clang-unwrapped;

     

       359
       359
       +
               libcxx = null;

     

       360
       360
       +
               bintools = bintoolsNoLibc';

     

       361
       361
       +
               extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       362
       362
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       363
       363
       +
               nixSupport.cc-cflags = [

     

       364
       364
       +
                 "-rtlib=compiler-rt"

     

       365
       365
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       366
       366
       +
               ]

     

       367
       367
       +
               ++ lib.optional (

     

       368
       368
       +
                 lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       369
       369
       +
               ) "-fno-exceptions";

     

       370
       370
       +
             };

     

       432
       371
        
       

     

       433
       433
       -
             clangNoLibcNoRt = wrapCCWith (

     

       434
       434
       -
               rec {

     

       435
       435
       -
                 cc = tools.clang-unwrapped;

     

       436
       436
       -
                 libcxx = null;

     

       437
       437
       -
                 bintools = bintoolsNoLibc';

     

       438
       438
       -
                 extraPackages = [ ];

     

       439
       439
       -
                 # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.

     

       440
       440
       -
                 extraBuildCommands = mkExtraBuildCommands0 cc;

     

       441
       441
       -
               }

     

       442
       442
       -
               // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {

     

       443
       443
       -
                 nixSupport.cc-cflags = lib.optional (

     

       444
       444
       -
                   lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       445
       445
       -
                 ) "-fno-exceptions";

     

       446
       446
       -
               }

     

       447
       447
       -
             );

     

       372
       372
       +
             clangNoLibcNoRt = wrapCCWith rec {

     

       373
       373
       +
               cc = tools.clang-unwrapped;

     

       374
       374
       +
               libcxx = null;

     

       375
       375
       +
               bintools = bintoolsNoLibc';

     

       376
       376
       +
               extraPackages = [ ];

     

       377
       377
       +
               # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.

     

       378
       378
       +
               extraBuildCommands = mkExtraBuildCommands0 cc;

     

       379
       379
       +
               nixSupport.cc-cflags = lib.optional (

     

       380
       380
       +
                 lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       381
       381
       +
               ) "-fno-exceptions";

     

       382
       382
       +
             };

     

       448
       383
        
       

     

       449
       384
        
             # This is an "oddly ordered" bootstrap just for Darwin. Probably

     

       450
       385
        
             # don't want it otherwise.

     
···

       498
       433
        
         libraries = lib.makeExtensible (

     

       499
       434
        
           libraries:

     

       500
       435
        
           let

     

       501
       501
       -
             callPackage = newScope (

     

       502
       502
       -
               libraries

     

       503
       503
       -
               // buildLlvmTools

     

       504
       504
       -
               // args

     

       505
       505
       -
               // metadata

     

       506
       506
       -
               # Previously monorepoSrc was erroneously not being passed through.

     

       507
       507
       -
               // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild.

     

       508
       508
       -
             );

     

       436
       436
       +
             callPackage = newScope (libraries // buildLlvmTools // args // metadata);

     

       509
       437
        
           in

     

       510
       438
        
           (

     

       511
       439
        
             {

     
···

       561
       489
        
       

     

       562
       490
        
               libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;

     

       563
       491
        
       

     

       564
       564
       -
               libcxx = callPackage ./libcxx (

     

       565
       565
       -
                 {

     

       566
       566
       -
                   stdenv =

     

       567
       567
       -
                     if stdenv.hostPlatform.isDarwin then

     

       568
       568
       -
                       overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt

     

       569
       569
       -
                     else

     

       570
       570
       -
                       overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       571
       571
       -
                 }

     

       572
       572
       -
                 // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") {

     

       573
       573
       -
                   # TODO: remove this, causes LLVM 13 packages rebuild.

     

       574
       574
       -
                   inherit (metadata) monorepoSrc; # Preserve bug during #307211 refactor.

     

       575
       575
       -
                 }

     

       576
       576
       -
               );

     

       492
       492
       +
               libcxx = callPackage ./libcxx {

     

       493
       493
       +
                 stdenv =

     

       494
       494
       +
                   if stdenv.hostPlatform.isDarwin then

     

       495
       495
       +
                     overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt

     

       496
       496
       +
                   else

     

       497
       497
       +
                     overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       498
       498
       +
               };

     

       577
       499
        
       

     

       578
       500
        
               libunwind = callPackage ./libunwind {

     

       579
       501
        
                 stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

+5 -11

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

···

       30
       30
        
         pname = "libclc";

     

       31
       31
        
         inherit version;

     

       32
       32
        
       

     

       33
       33
       -
         src = runCommand "libclc-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       34
       34
       -
           ''

     

       35
       35
       -
             mkdir -p "$out"

     

       36
       36
       -
           ''

     

       37
       37
       -
           + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       38
       38
       -
             cp -r ${monorepoSrc}/cmake "$out"

     

       39
       39
       -
           ''

     

       40
       40
       -
           + ''

     

       41
       41
       -
             cp -r ${monorepoSrc}/libclc "$out"

     

       42
       42
       -
           ''

     

       43
       43
       -
         );

     

       33
       33
       +
         src = runCommand "libclc-src-${version}" { inherit (monorepoSrc) passthru; } (''

     

       34
       34
       +
           mkdir -p "$out"

     

       35
       35
       +
           cp -r ${monorepoSrc}/cmake "$out"

     

       36
       36
       +
           cp -r ${monorepoSrc}/libclc "$out"

     

       37
       37
       +
         '');

     

       44
       38
        
       

     

       45
       39
        
         sourceRoot = "${finalAttrs.src.name}/libclc";

     

       46
       40

+7 -16

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

···

       135
       135
        
               runCommand "libcxx-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       136
       136
        
                 ''

     

       137
       137
        
                   mkdir -p "$out/llvm"

     

       138
       138
       -
                 ''

     

       139
       139
       -
                 + (lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       140
       138
        
                   cp -r ${monorepoSrc}/cmake "$out"

     

       141
       141
       -
                 '')

     

       142
       142
       -
                 + ''

     

       143
       139
        
                   cp -r ${monorepoSrc}/libcxx "$out"

     

       144
       140
        
                   cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"

     

       145
       141
        
                   cp -r ${monorepoSrc}/llvm/utils "$out/llvm"

     

       146
       146
       -
                 ''

     

       147
       147
       -
                 + (lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       148
       142
        
                   cp -r ${monorepoSrc}/third-party "$out"

     

       149
       149
       -
                 '')

     

       143
       143
       +
                 ''

     

       150
       144
        
                 + (lib.optionalString (lib.versionAtLeast release_version "20") ''

     

       151
       145
        
                   cp -r ${monorepoSrc}/libc "$out"

     

       152
       146
        
                 '')

     
···

       273
       267
        
           if (lib.versionOlder release_version "16" || lib.versionAtLeast release_version "17") then

     

       274
       268
        
             {

     

       275
       269
        
               postPatch =

     

       276
       276
       -
                 (lib.optionalString

     

       277
       277
       -
                   (lib.versionAtLeast release_version "14" && lib.versionOlder release_version "15")

     

       278
       278
       -
                   ''

     

       279
       279
       -
                     # fix CMake error when static and LIBCXXABI_USE_LLVM_UNWINDER=ON. aren't

     

       280
       280
       -
                     # building unwind so don't need to depend on it

     

       281
       281
       -
                     substituteInPlace libcxx/src/CMakeLists.txt \

     

       282
       282
       -
                       --replace-fail "add_dependencies(cxx_static unwind)" "# add_dependencies(cxx_static unwind)"

     

       283
       283
       -
                   ''

     

       284
       284
       -
                 )

     

       270
       270
       +
                 (lib.optionalString (lib.versionOlder release_version "15") ''

     

       271
       271
       +
                   # fix CMake error when static and LIBCXXABI_USE_LLVM_UNWINDER=ON. aren't

     

       272
       272
       +
                   # building unwind so don't need to depend on it

     

       273
       273
       +
                   substituteInPlace libcxx/src/CMakeLists.txt \

     

       274
       274
       +
                     --replace-fail "add_dependencies(cxx_static unwind)" "# add_dependencies(cxx_static unwind)"

     

       275
       275
       +
                 '')

     

       285
       276
        
                 + ''

     

       286
       277
        
                   cd runtimes

     

       287
       278
        
                 '';

-4

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

···

       35
       35
        
               runCommand "libunwind-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       36
       36
        
                 ''

     

       37
       37
        
                   mkdir -p "$out"

     

       38
       38
       -
                 ''

     

       39
       39
       -
                 + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       40
       38
        
                   cp -r ${monorepoSrc}/cmake "$out"

     

       41
       41
       -
                 ''

     

       42
       42
       -
                 + ''

     

       43
       39
        
                   cp -r ${monorepoSrc}/libunwind "$out"

     

       44
       40
        
                   mkdir -p "$out/libcxx"

     

       45
       41
        
                   cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx"

+11 -24

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

···

       22
       22
        
       

     

       23
       23
        
         src =

     

       24
       24
        
           if monorepoSrc != null then

     

       25
       25
       -
             runCommand "lld-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       26
       26
       -
               ''

     

       27
       27
       -
                 mkdir -p "$out"

     

       28
       28
       -
               ''

     

       29
       29
       -
               + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       30
       30
       -
                 cp -r ${monorepoSrc}/cmake "$out"

     

       31
       31
       -
               ''

     

       32
       32
       -
               + ''

     

       33
       33
       -
                 cp -r ${monorepoSrc}/lld "$out"

     

       34
       34
       -
                 mkdir -p "$out/libunwind"

     

       35
       35
       -
                 cp -r ${monorepoSrc}/libunwind/include "$out/libunwind"

     

       36
       36
       -
                 mkdir -p "$out/llvm"

     

       37
       37
       -
               ''

     

       38
       38
       -
             )

     

       25
       25
       +
             runCommand "lld-src-${version}" { inherit (monorepoSrc) passthru; } (''

     

       26
       26
       +
               mkdir -p "$out"

     

       27
       27
       +
               cp -r ${monorepoSrc}/cmake "$out"

     

       28
       28
       +
               cp -r ${monorepoSrc}/lld "$out"

     

       29
       29
       +
               mkdir -p "$out/libunwind"

     

       30
       30
       +
               cp -r ${monorepoSrc}/libunwind/include "$out/libunwind"

     

       31
       31
       +
               mkdir -p "$out/llvm"

     

       32
       32
       +
             '')

     

       39
       33
        
           else

     

       40
       34
        
             src;

     

       41
       35
        
       

     
···

       67
       61
        
         ];

     

       68
       62
        
       

     

       69
       63
        
         cmakeFlags =

     

       70
       70
       -
           lib.optionals (lib.versionOlder release_version "14") [

     

       71
       71
       -
             (lib.cmakeFeature "LLVM_CONFIG_PATH" "${libllvm.dev}/bin/llvm-config${

     

       72
       72
       -
               lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"

     

       73
       73
       -
             }")

     

       74
       74
       -
           ]

     

       75
       75
       -
           ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       64
       64
       +
           lib.optionals (lib.versionAtLeast release_version "15") [

     

       76
       65
        
             (lib.cmakeFeature "LLD_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/lld")

     

       77
       66
        
           ]

     

       78
       67
        
           ++ [

     
···

       80
       69
        
           ]

     

       81
       70
        
           ++ devExtraCmakeFlags;

     

       82
       71
        
       

     

       83
       83
       -
         postPatch = lib.optionalString (lib.versionOlder release_version "14") ''

     

       84
       84
       -
           substituteInPlace MachO/CMakeLists.txt --replace-fail \

     

       85
       85
       -
             '(''${LLVM_MAIN_SRC_DIR}/' '(../'

     

       86
       86
       -
         '';

     

       72
       72
       +
         # TODO: Remove on `staging`.

     

       73
       73
       +
         postPatch = "";

     

       87
       74
        
       

     

       88
       75
        
         # Musl's default stack size is too small for lld to be able to link Firefox.

     

       89
       76
        
         LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";

+3 -12

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

···

       49
       49
        
               runCommand "lldb-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       50
       50
        
                 ''

     

       51
       51
        
                   mkdir -p "$out"

     

       52
       52
       -
                 ''

     

       53
       53
       -
                 + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       54
       52
        
                   cp -r ${monorepoSrc}/cmake "$out"

     

       55
       55
       -
                 ''

     

       56
       56
       -
                 + ''

     

       57
       53
        
                   cp -r ${monorepoSrc}/lldb "$out"

     

       58
       54
        
                 ''

     

       59
       55
        
                 + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) ''

     
···

       126
       122
        
                 hash = "sha256-eFcvxZaAuBsY/bda1h9212QevrXyvCHw8Cr9ngetDr0=";

     

       127
       123
        
               })

     

       128
       124
        
             ]

     

       129
       129
       -
             ++ lib.optional (lib.versionOlder release_version "14") (

     

       130
       130
       -
               getVersionFile "lldb/gnu-install-dirs.patch"

     

       131
       131
       -
             )

     

       132
       132
       -
             ++ lib.optional (lib.versionAtLeast release_version "14") ./gnu-install-dirs.patch;

     

       125
       125
       +
             ++ [ ./gnu-install-dirs.patch ];

     

       133
       126
        
       

     

       134
       127
        
           nativeBuildInputs = [

     

       135
       128
        
             cmake

     
···

       149
       142
        
           ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [

     

       150
       143
        
             python3.pkgs.myst-parser

     

       151
       144
        
           ]

     

       152
       152
       -
           ++ lib.optionals (lib.versionAtLeast release_version "14") [

     

       145
       145
       +
           # TODO: Clean up on `staging`.

     

       146
       146
       +
           ++ [

     

       153
       147
        
             ninja

     

       154
       148
        
           ];

     

       155
       149
        
       

     
···

       217
       211
        
                 echo "ERROR: python files not installed where expected!";

     

       218
       212
        
                 return 1;

     

       219
       213
        
             fi

     

       220
       220
       -
           '' # Something lua is built on older versions but this file doesn't exist.

     

       221
       221
       -
           + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       222
       214
        
             if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then

     

       223
       215
        
                 echo "ERROR: lua files not installed where expected!";

     

       224
       216
        
                 return 1;

     
···

       250
       242
        
               larger LLVM Project, such as the Clang expression parser and LLVM

     

       251
       243
        
               disassembler.

     

       252
       244
        
             '';

     

       253
       253
       -
             broken = lib.versionOlder release_version "14";

     

       254
       245
        
             mainProgram = "lldb";

     

       255
       246
        
           };

     

       256
       247
        
         }

+12 -52

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

···

       31
       31
        
           # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245

     

       32
       32
        
           # broken for the armv7l builder

     

       33
       33
        
           && !stdenv.hostPlatform.isAarch,

     

       34
       34
       -
         enablePolly ? lib.versionAtLeast release_version "14",

     

       34
       34
       +
         enablePolly ? true,

     

       35
       35
        
         enableTerminfo ? true,

     

       36
       36
        
         devExtraCmakeFlags ? [ ],

     

       37
       37
        
         getVersionFile,

     
···

       92
       92
        
                 ''

     

       93
       93
        
                   mkdir -p "$out"

     

       94
       94
        
                   cp -r ${monorepoSrc}/llvm "$out"

     

       95
       95
       -
                 ''

     

       96
       96
       -
                 + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       97
       95
        
                   cp -r ${monorepoSrc}/cmake "$out"

     

       98
       96
        
                   cp -r ${monorepoSrc}/third-party "$out"

     

       99
       97
        
                 ''

     
···

       123
       121
        
           ];

     

       124
       122
        
       

     

       125
       123
        
           patches =

     

       126
       126
       -
             lib.optional (lib.versionOlder release_version "14")

     

       127
       127
       -
               # When cross-compiling we configure llvm-config-native with an approximation

     

       128
       128
       -
               # of the flags used for the normal LLVM build. To avoid the need for building

     

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

     

       130
       130
       -
               # statically against the necessary LLVM components always.

     

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

     

       132
       124
        
             # Support custom installation dirs

     

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

     

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

     

       135
       135
       -
             ++ [ (getVersionFile "llvm/gnu-install-dirs.patch") ]

     

       127
       127
       +
             [ (getVersionFile "llvm/gnu-install-dirs.patch") ]

     

       136
       128
        
             ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       137
       129
        
               # Running the tests involves invoking binaries (like `opt`) that depend on

     

       138
       130
        
               # the LLVM dylibs and reference them by absolute install path (i.e. their

     
···

       176
       168
        
               (getVersionFile "llvm/lit-shell-script-runner-set-dyld-library-path.patch")

     

       177
       169
        
             ]

     

       178
       170
        
             ++

     

       179
       179
       -
               lib.optional (lib.versions.major release_version == "13")

     

       180
       180
       -
                 # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611

     

       181
       181
       -
                 (

     

       182
       182
       -
                   fetchpatch {

     

       183
       183
       -
                     url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch";

     

       184
       184
       -
                     sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g";

     

       185
       185
       -
                     stripLen = 1;

     

       186
       186
       -
                   }

     

       187
       187
       -
                 )

     

       188
       188
       -
             ++

     

       189
       171
        
               lib.optional (lib.versionOlder release_version "19")

     

       190
       172
        
                 # Add missing include headers to build against gcc-15:

     

       191
       173
        
                 #   https://github.com/llvm/llvm-project/pull/101761

     
···

       206
       188
        
               # Fix for Python 3.13

     

       207
       189
        
               (getVersionFile "llvm/no-pipes.patch")

     

       208
       190
        
             ]

     

       209
       209
       -
             ++ lib.optionals (lib.versionOlder release_version "14") [

     

       210
       210
       -
               # Backport gcc-13 fixes with missing includes.

     

       211
       211
       -
               (fetchpatch {

     

       212
       212
       -
                 name = "signals-gcc-13.patch";

     

       213
       213
       -
                 url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";

     

       214
       214
       -
                 hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";

     

       215
       215
       -
                 stripLen = 1;

     

       216
       216
       -
               })

     

       191
       191
       +
             ++ lib.optionals (lib.versionOlder (lib.versions.major release_version) "17") [

     

       192
       192
       +
               # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)

     

       193
       193
       +
               # See also: https://github.com/numba/numba/issues/9109

     

       217
       194
        
               (fetchpatch {

     

       218
       218
       -
                 name = "base64-gcc-13.patch";

     

       219
       219
       -
                 url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch";

     

       220
       220
       -
                 hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U=";

     

       221
       221
       -
                 stripLen = 1;

     

       195
       195
       +
                 url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch";

     

       196
       196
       +
                 relative = "llvm";

     

       197
       197
       +
                 hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA=";

     

       222
       198
        
               })

     

       223
       199
        
             ]

     

       224
       224
       -
             ++

     

       225
       225
       -
               lib.optionals

     

       226
       226
       -
                 (

     

       227
       227
       -
                   (lib.versionAtLeast (lib.versions.major release_version) "14")

     

       228
       228
       -
                   && (lib.versionOlder (lib.versions.major release_version) "17")

     

       229
       229
       -
                 )

     

       230
       230
       -
                 [

     

       231
       231
       -
                   # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)

     

       232
       232
       -
                   # See also: https://github.com/numba/numba/issues/9109

     

       233
       233
       -
                   (fetchpatch {

     

       234
       234
       -
                     url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch";

     

       235
       235
       -
                     relative = "llvm";

     

       236
       236
       -
                     hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA=";

     

       237
       237
       -
                   })

     

       238
       238
       -
                 ]

     

       239
       200
        
             ++

     

       240
       201
        
               lib.optional (lib.versions.major release_version == "17")

     

       241
       202
        
                 # Fixes a crash with -fzero-call-used-regs=used-gpr

     
···

       321
       282
        
           ]

     

       322
       283
        
           ++ optional enablePFM libpfm; # exegesis

     

       323
       284
        
       

     

       324
       324
       -
           propagatedBuildInputs =

     

       325
       325
       -
             (lib.optional (

     

       326
       326
       -
               lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform

     

       327
       327
       -
             ) ncurses)

     

       328
       328
       -
             ++ [ zlib ];

     

       285
       285
       +
           propagatedBuildInputs = [

     

       286
       286
       +
             ncurses

     

       287
       287
       +
             zlib

     

       288
       288
       +
           ];

     

       329
       289
        
       

     

       330
       290
        
           nativeCheckInputs = [

     

       331
       291
        
             which

-12

pkgs/development/compilers/llvm/common/llvm/llvm-config-link-static.patch

···

       1
       1
       -
       diff --git llvm/tools/llvm-config/CMakeLists.txt llvm/tools/llvm-config/CMakeLists.txt

     

       2
       2
       -
       index 16ba54c0cf2f..20b017195e84 100644

     

       3
       3
       -
       --- llvm/tools/llvm-config/CMakeLists.txt

     

       4
       4
       -
       +++ llvm/tools/llvm-config/CMakeLists.txt

     

       5
       5
       -
       @@ -6,6 +6,7 @@ set(BUILDVARIABLES_OBJPATH ${CMAKE_CURRENT_BINARY_DIR}/BuildVariables.inc)

     

       6
       6
       -
        # Add the llvm-config tool.

     

       7
       7
       -
        add_llvm_tool(llvm-config

     

       8
       8
       -
          llvm-config.cpp

     

       9
       9
       -
       +  DISABLE_LLVM_LINK_LLVM_DYLIB

     

       10
       10
       -
          )

     

       11
       11
       -
        

     

       12
       12
       -
        # Compute the substitution values for various items.

+7 -13

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

···

       25
       25
        
           && (!stdenv.hostPlatform.isMusl);

     

       26
       26
        
       

     

       27
       27
        
         # Blank llvm dir just so relative path works

     

       28
       28
       -
         src = runCommand "${finalAttrs.pname}-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       29
       29
       -
           ''

     

       30
       30
       -
             mkdir -p "$out"

     

       31
       31
       -
           ''

     

       32
       32
       -
           + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       33
       33
       -
             cp -r ${monorepoSrc}/cmake "$out"

     

       34
       34
       -
           ''

     

       35
       35
       -
           + ''

     

       36
       36
       -
             cp -r ${monorepoSrc}/mlir "$out"

     

       37
       37
       -
             cp -r ${monorepoSrc}/third-party "$out/third-party"

     

       28
       28
       +
         src = runCommand "${finalAttrs.pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''

     

       29
       29
       +
           mkdir -p "$out"

     

       30
       30
       +
           cp -r ${monorepoSrc}/cmake "$out"

     

       31
       31
       +
           cp -r ${monorepoSrc}/mlir "$out"

     

       32
       32
       +
           cp -r ${monorepoSrc}/third-party "$out/third-party"

     

       38
       33
        
       

     

       39
       39
       -
             mkdir -p "$out/llvm"

     

       40
       40
       -
           ''

     

       41
       41
       -
         );

     

       34
       34
       +
           mkdir -p "$out/llvm"

     

       35
       35
       +
         '');

     

       42
       36
        
       

     

       43
       37
        
         sourceRoot = "${finalAttrs.src.name}/mlir";

     

       44
       38

+83 -101

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

···

       25
       25
        
       

     

       26
       26
        
       assert lib.assertMsg (ompdGdbSupport -> ompdSupport) "OMPD GDB support requires OMPD support!";

     

       27
       27
        
       

     

       28
       28
       -
       stdenv.mkDerivation (

     

       29
       29
       -
         finalAttrs:

     

       30
       30
       -
         {

     

       31
       31
       -
           pname = "openmp";

     

       32
       32
       -
           inherit version;

     

       33
       33
       -
       

     

       34
       34
       -
           src =

     

       35
       35
       -
             if monorepoSrc != null then

     

       36
       36
       -
               runCommand "openmp-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       37
       37
       -
                 ''

     

       38
       38
       -
                   mkdir -p "$out"

     

       39
       39
       -
                 ''

     

       40
       40
       -
                 + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       41
       41
       -
                   cp -r ${monorepoSrc}/cmake "$out"

     

       42
       42
       -
                 ''

     

       43
       43
       -
                 + ''

     

       44
       44
       -
                   cp -r ${monorepoSrc}/openmp "$out"

     

       45
       45
       -
                 ''

     

       46
       46
       -
               )

     

       47
       47
       -
             else

     

       48
       48
       -
               src;

     

       28
       28
       +
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
       +
         pname = "openmp";

     

       30
       30
       +
         inherit version;

     

       49
       31
        
       

     

       50
       50
       -
           sourceRoot = "${finalAttrs.src.name}/openmp";

     

       32
       32
       +
         src =

     

       33
       33
       +
           if monorepoSrc != null then

     

       34
       34
       +
             runCommand "openmp-src-${version}" { inherit (monorepoSrc) passthru; } (''

     

       35
       35
       +
               mkdir -p "$out"

     

       36
       36
       +
               cp -r ${monorepoSrc}/cmake "$out"

     

       37
       37
       +
               cp -r ${monorepoSrc}/openmp "$out"

     

       38
       38
       +
             '')

     

       39
       39
       +
           else

     

       40
       40
       +
             src;

     

       51
       41
        
       

     

       52
       52
       -
           outputs = [ "out" ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "dev" ];

     

       42
       42
       +
         sourceRoot = "${finalAttrs.src.name}/openmp";

     

       53
       43
        
       

     

       54
       54
       -
           patchFlags = if lib.versionOlder release_version "14" then [ "-p2" ] else null;

     

       44
       44
       +
         outputs = [

     

       45
       45
       +
           "out"

     

       46
       46
       +
           "dev"

     

       47
       47
       +
         ];

     

       55
       48
        
       

     

       56
       56
       -
           patches =

     

       57
       57
       -
             lib.optional (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "19") (

     

       58
       58
       -
               getVersionFile "openmp/fix-find-tool.patch"

     

       59
       59
       -
             )

     

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

     

       61
       61
       -
               getVersionFile "openmp/gnu-install-dirs.patch"

     

       62
       62
       -
             )

     

       63
       63
       -
             ++ lib.optional (lib.versionAtLeast release_version "14") (

     

       64
       64
       -
               getVersionFile "openmp/run-lit-directly.patch"

     

       65
       65
       -
             )

     

       66
       66
       -
             ++

     

       67
       67
       -
               lib.optional (lib.versionOlder release_version "14")

     

       68
       68
       -
                 # Fix cross.

     

       69
       69
       -
                 (

     

       70
       70
       -
                   fetchpatch {

     

       71
       71
       -
                     url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch";

     

       72
       72
       -
                     hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A=";

     

       73
       73
       -
                   }

     

       74
       74
       -
                 );

     

       49
       49
       +
         # TODO: Remove on `staging`.

     

       50
       50
       +
         patchFlags = null;

     

       75
       51
        
       

     

       76
       76
       -
           nativeBuildInputs = [

     

       77
       77
       -
             cmake

     

       78
       78
       -
             python3.pythonOnBuildForHost

     

       79
       79
       -
             perl

     

       80
       80
       -
           ]

     

       81
       81
       -
           ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       82
       82
       -
             ninja

     

       83
       83
       -
           ]

     

       84
       84
       -
           ++ lib.optionals (lib.versionAtLeast release_version "14") [

     

       85
       85
       -
             pkg-config

     

       86
       86
       -
             lit

     

       52
       52
       +
         patches =

     

       53
       53
       +
           lib.optional (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "19") (

     

       54
       54
       +
             getVersionFile "openmp/fix-find-tool.patch"

     

       55
       55
       +
           )

     

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

     

       57
       57
       +
             getVersionFile "openmp/gnu-install-dirs.patch"

     

       58
       58
       +
           )

     

       59
       59
       +
           ++ [

     

       60
       60
       +
             (getVersionFile "openmp/run-lit-directly.patch")

     

       87
       61
        
           ];

     

       88
       62
        
       

     

       89
       89
       -
           buildInputs = [

     

       90
       90
       -
             (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

     

       91
       91
       -
           ]

     

       92
       92
       -
           ++ lib.optionals (ompdSupport && ompdGdbSupport) [

     

       93
       93
       -
             python3

     

       94
       94
       -
           ];

     

       63
       63
       +
         nativeBuildInputs = [

     

       64
       64
       +
           cmake

     

       65
       65
       +
           python3.pythonOnBuildForHost

     

       66
       66
       +
           perl

     

       67
       67
       +
         ]

     

       68
       68
       +
         ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       69
       69
       +
           ninja

     

       70
       70
       +
         ]

     

       71
       71
       +
         ++ [

     

       72
       72
       +
           pkg-config

     

       73
       73
       +
           lit

     

       74
       74
       +
         ];

     

       95
       75
        
       

     

       96
       96
       -
           cmakeFlags = [

     

       97
       97
       -
             (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (

     

       98
       98
       -
               !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries

     

       99
       99
       -
             ))

     

       100
       100
       -
             (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)

     

       101
       101
       -
             (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)

     

       102
       102
       -
           ]

     

       103
       103
       -
           ++ lib.optionals (lib.versions.major release_version == "13") [

     

       104
       104
       -
             (lib.cmakeBool "LIBOMPTARGET_BUILD_AMDGCN_BCLIB" false) # Building the AMDGCN device RTL fails

     

       105
       105
       -
           ]

     

       106
       106
       -
           ++ lib.optionals (lib.versionAtLeast release_version "14") [

     

       107
       107
       -
             (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang")

     

       108
       108
       -
             (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")

     

       109
       109
       -
             (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")

     

       110
       110
       -
           ]

     

       111
       111
       -
           ++ devExtraCmakeFlags;

     

       76
       76
       +
         buildInputs = [

     

       77
       77
       +
           (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

     

       78
       78
       +
         ]

     

       79
       79
       +
         ++ lib.optionals (ompdSupport && ompdGdbSupport) [

     

       80
       80
       +
           python3

     

       81
       81
       +
         ];

     

       112
       82
        
       

     

       113
       113
       -
           meta = llvm_meta // {

     

       114
       114
       -
             homepage = "https://openmp.llvm.org/";

     

       115
       115
       -
             description = "Support for the OpenMP language";

     

       116
       116
       -
             longDescription = ''

     

       117
       117
       -
               The OpenMP subproject of LLVM contains the components required to build an

     

       118
       118
       -
               executable OpenMP program that are outside the compiler itself.

     

       119
       119
       -
               Contains the code for the runtime library against which code compiled by

     

       120
       120
       -
               "clang -fopenmp" must be linked before it can run and the library that

     

       121
       121
       -
               supports offload to target devices.

     

       122
       122
       -
             '';

     

       123
       123
       -
             # "All of the code is dual licensed under the MIT license and the UIUC

     

       124
       124
       -
             # License (a BSD-like license)":

     

       125
       125
       -
             license = with lib.licenses; [

     

       126
       126
       -
               mit

     

       127
       127
       -
               ncsa

     

       128
       128
       -
             ];

     

       129
       129
       -
           };

     

       130
       130
       -
         }

     

       131
       131
       -
         // (lib.optionalAttrs (lib.versionAtLeast release_version "14") {

     

       132
       132
       -
           doCheck = false;

     

       133
       133
       -
           checkTarget = "check-openmp";

     

       134
       134
       -
           preCheck = ''

     

       135
       135
       -
             patchShebangs ../tools/archer/tests/deflake.bash

     

       83
       83
       +
         cmakeFlags = [

     

       84
       84
       +
           (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (

     

       85
       85
       +
             !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries

     

       86
       86
       +
           ))

     

       87
       87
       +
           (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)

     

       88
       88
       +
           (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)

     

       89
       89
       +
           (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang")

     

       90
       90
       +
           (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")

     

       91
       91
       +
           (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")

     

       92
       92
       +
         ]

     

       93
       93
       +
         ++ devExtraCmakeFlags;

     

       94
       94
       +
       

     

       95
       95
       +
         doCheck = false;

     

       96
       96
       +
       

     

       97
       97
       +
         checkTarget = "check-openmp";

     

       98
       98
       +
       

     

       99
       99
       +
         preCheck = ''

     

       100
       100
       +
           patchShebangs ../tools/archer/tests/deflake.bash

     

       101
       101
       +
         '';

     

       102
       102
       +
       

     

       103
       103
       +
         meta = llvm_meta // {

     

       104
       104
       +
           homepage = "https://openmp.llvm.org/";

     

       105
       105
       +
           description = "Support for the OpenMP language";

     

       106
       106
       +
           longDescription = ''

     

       107
       107
       +
             The OpenMP subproject of LLVM contains the components required to build an

     

       108
       108
       +
             executable OpenMP program that are outside the compiler itself.

     

       109
       109
       +
             Contains the code for the runtime library against which code compiled by

     

       110
       110
       +
             "clang -fopenmp" must be linked before it can run and the library that

     

       111
       111
       +
             supports offload to target devices.

     

       136
       112
        
           '';

     

       137
       137
       -
         })

     

       138
       138
       -
       )

     

       113
       113
       +
           # "All of the code is dual licensed under the MIT license and the UIUC

     

       114
       114
       +
           # License (a BSD-like license)":

     

       115
       115
       +
           license = with lib.licenses; [

     

       116
       116
       +
             mit

     

       117
       117
       +
             ncsa

     

       118
       118
       +
           ];

     

       119
       119
       +
         };

     

       120
       120
       +
       })

+9 -23

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

···

       1
       1
        
       {

     

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

     

       3
       3
        
           {

     

       4
       4
       -
             before = "14";

     

       5
       5
       -
             path = ../13;

     

       6
       6
       -
           }

     

       7
       7
       -
           {

     

       8
       4
        
             after = "19";

     

       9
       5
        
             path = ../19;

     

       10
       6
        
           }

     
···

       21
       17
        
           }

     

       22
       18
        
           {

     

       23
       19
        
             before = "16";

     

       24
       24
       -
             path = ../13;

     

       20
       20
       +
             path = ../14;

     

       25
       21
        
           }

     

       26
       22
        
         ];

     

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

     
···

       42
       38
        
             after = "18";

     

       43
       39
        
             path = ../18;

     

       44
       40
        
           }

     

       45
       45
       -
           {

     

       46
       46
       -
             before = "14";

     

       47
       47
       -
             path = ../13;

     

       48
       48
       -
           }

     

       49
       41
        
         ];

     

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

     

       51
       43
        
           {

     
···

       80
       72
        
           }

     

       81
       73
        
           {

     

       82
       74
        
             before = "18";

     

       83
       83
       -
             after = "14";

     

       84
       75
        
             path = ../14;

     

       85
       76
        
           }

     

       86
       77
        
         ];

     
···

       126
       117
        
           }

     

       127
       118
        
           {

     

       128
       119
        
             before = "15";

     

       129
       129
       -
             path = ../13;

     

       120
       120
       +
             path = ../14;

     

       130
       121
        
           }

     

       131
       122
        
         ];

     

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

     
···

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

     

       148
       139
        
           {

     

       149
       140
        
             before = "15";

     

       150
       150
       -
             path = ../13;

     

       141
       141
       +
             path = ../14;

     

       151
       142
        
           }

     

       152
       143
        
         ];

     

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

     

       154
       145
        
           {

     

       155
       155
       -
             before = "14";

     

       156
       156
       -
             path = ../13;

     

       157
       157
       -
           }

     

       158
       158
       -
           {

     

       159
       146
        
             before = "15";

     

       160
       147
        
             path = ../14;

     

       161
       148
        
           }

     
···

       171
       158
        
         ];

     

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

     

       173
       160
        
           {

     

       174
       174
       -
             path = ../13;

     

       161
       161
       +
             path = ../14;

     

       175
       162
        
           }

     

       176
       163
        
         ];

     

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

     

       178
       165
        
           {

     

       179
       179
       -
             path = ../13;

     

       166
       166
       +
             path = ../14;

     

       180
       167
        
           }

     

       181
       168
        
         ];

     

       182
       169
        
         "compiler-rt/normalize-var.patch" = [

     
···

       186
       173
        
           }

     

       187
       174
        
           {

     

       188
       175
        
             before = "16";

     

       189
       189
       -
             path = ../13;

     

       176
       176
       +
             path = ../14;

     

       190
       177
        
           }

     

       191
       178
        
         ];

     

       192
       179
        
         "lldb/procfs.patch" = [

     
···

       196
       183
        
           }

     

       197
       184
        
           {

     

       198
       185
        
             before = "15";

     

       199
       199
       -
             path = ../13;

     

       186
       186
       +
             path = ../14;

     

       200
       187
        
           }

     

       201
       188
        
         ];

     

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

     

       203
       190
        
           {

     

       204
       191
        
             before = "16";

     

       205
       205
       -
             path = ../13;

     

       192
       192
       +
             path = ../14;

     

       206
       193
        
           }

     

       207
       194
        
         ];

     

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

     

       209
       196
        
           {

     

       210
       197
        
             before = "16";

     

       211
       211
       -
             path = ../13;

     

       198
       198
       +
             path = ../14;

     

       212
       199
        
           }

     

       213
       200
        
         ];

     

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

     
···

       224
       211
        
             path = ../16;

     

       225
       212
        
           }

     

       226
       213
        
           {

     

       227
       227
       -
             after = "14";

     

       228
       214
        
             before = "16";

     

       229
       215
        
             path = ../14;

     

       230
       216
        
           }

+9 -15

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

···

       38
       38
        
       

     

       39
       39
        
         src' =

     

       40
       40
        
           if monorepoSrc != null then

     

       41
       41
       -
             runCommand "${pname}-src-${version}" { } (

     

       42
       42
       -
               ''

     

       43
       43
       -
                 mkdir -p "$out"

     

       44
       44
       -
               ''

     

       45
       45
       -
               + lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       46
       46
       -
                 cp -r ${monorepoSrc}/cmake "$out"

     

       47
       47
       -
                 cp -r ${monorepoSrc}/third-party "$out"

     

       48
       48
       -
               ''

     

       49
       49
       -
               + ''

     

       50
       50
       -
                 cp -r ${monorepoSrc}/llvm "$out"

     

       51
       51
       -
                 cp -r ${monorepoSrc}/clang "$out"

     

       52
       52
       -
                 cp -r ${monorepoSrc}/clang-tools-extra "$out"

     

       53
       53
       -
                 cp -r ${monorepoSrc}/mlir "$out"

     

       54
       54
       -
               ''

     

       55
       55
       -
             )

     

       41
       41
       +
             runCommand "${pname}-src-${version}" { } (''

     

       42
       42
       +
               mkdir -p "$out"

     

       43
       43
       +
               cp -r ${monorepoSrc}/cmake "$out"

     

       44
       44
       +
               cp -r ${monorepoSrc}/third-party "$out"

     

       45
       45
       +
               cp -r ${monorepoSrc}/llvm "$out"

     

       46
       46
       +
               cp -r ${monorepoSrc}/clang "$out"

     

       47
       47
       +
               cp -r ${monorepoSrc}/clang-tools-extra "$out"

     

       48
       48
       +
               cp -r ${monorepoSrc}/mlir "$out"

     

       49
       49
       +
             '')

     

       56
       50
        
           else

     

       57
       51
        
             src;

     

       58
       52

-1

pkgs/development/compilers/llvm/default.nix

···

       22
       22
        
       }@packageSetArgs:

     

       23
       23
        
       let

     

       24
       24
        
         versions = {

     

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

     

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

     

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

     

       28
       27
        
           "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";

+5 -17

pkgs/development/compilers/llvm/update.sh

···

       20
       20
        
       

     

       21
       21
        
       readonly ATTRSET="llvmPackages_$VERSION_MAJOR"

     

       22
       22
        
       

     

       23
       23
       -
       if [ "$VERSION_MAJOR" -ge "14" ]; then

     

       24
       24
       -
         readonly SOURCES=(

     

       25
       25
       -
           "llvm.monorepoSrc"

     

       26
       26
       -
         )

     

       27
       27
       -
       else

     

       28
       28
       -
         readonly SOURCES=(

     

       29
       29
       -
           "llvm.src"

     

       30
       30
       -
         )

     

       31
       31
       -
       fi

     

       32
       32
       -
       

     

       33
       33
       -
       for SOURCE in "${SOURCES[@]}"; do

     

       34
       34
       -
         echo "Updating the hash of $SOURCE:"

     

       35
       35
       -
         declare ATTR="$ATTRSET.$SOURCE"

     

       36
       36
       -
         declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)"

     

       37
       37
       -
         declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\""

     

       38
       38
       -
         find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} +

     

       39
       39
       -
       done

     

       23
       23
       +
       echo "Updating the hash of llvm.monorepoSrc:"

     

       24
       24
       +
       declare ATTR="$ATTRSET.llvm.monorepoSrc"

     

       25
       25
       +
       declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)"

     

       26
       26
       +
       declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\""

     

       27
       27
       +
       find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} +

     

       40
       28
        
       

     

       41
       29
        
       echo OK

pkgs/test/default.nix

···

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

     

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

     

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

     

       20
       20
       +
                   (filter (n: n != "llvmPackages_13"))

     

       20
       21
        
                 ];

     

       21
       22
        
                 tests = lib.genAttrs pkgSets (

     

       22
       23
        
                   name:

+8 -2

pkgs/top-level/aliases.nix

···

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

     

       699
       699
        
       

     

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

     

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

     

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

     

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

     

       704
       703
        
         clang16Stdenv = lowPrio llvmPackages_16.stdenv; # preserve, reason: see above

     
···

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

     

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

     

       708
       707
        
       

     

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

     

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

     

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

     

       712
       710
        
         clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22

     
···

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

     

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

     

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

     

       1495
       1495
       +
       

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       1497
       1503
        
       

     

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

     

       1499
       1505
        
         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
       4633
        
         clang-manpages = llvmPackages.clang-manpages;

     

       4634
       4634
        
       

     

       4635
       4635
        
         clang = llvmPackages.clang;

     

       4636
       4636
       -
         clang_13 = llvmPackages_13.clang;

     

       4637
       4636
        
         clang_14 = llvmPackages_14.clang;

     

       4638
       4637
        
         clang_15 = llvmPackages_15.clang;

     

       4639
       4638
        
         clang_16 = llvmPackages_16.clang;

     
···

       5364
       5363
        
         };

     

       5365
       5364
        
       

     

       5366
       5365
        
         lld = llvmPackages.lld;

     

       5367
       5367
       -
         lld_13 = llvmPackages_13.lld;

     

       5368
       5366
        
         lld_14 = llvmPackages_14.lld;

     

       5369
       5367
        
         lld_15 = llvmPackages_15.lld;

     

       5370
       5368
        
         lld_16 = llvmPackages_16.lld;

     

       5371
       5369
        
         lld_17 = llvmPackages_17.lld;

     

       5372
       5370
        
       

     

       5373
       5371
        
         lldb = llvmPackages.lldb;

     

       5374
       5374
       -
         lldb_13 = llvmPackages_13.lldb;

     

       5375
       5372
        
         lldb_14 = llvmPackages_14.lldb;

     

       5376
       5373
        
         lldb_15 = llvmPackages_15.lldb;

     

       5377
       5374
        
         lldb_16 = llvmPackages_16.lldb;

     

       5378
       5375
        
         lldb_17 = llvmPackages_17.lldb;

     

       5379
       5376
        
       

     

       5380
       5377
        
         llvm = llvmPackages.llvm;

     

       5381
       5381
       -
         llvm_13 = llvmPackages_13.llvm;

     

       5382
       5378
        
         llvm_14 = llvmPackages_14.llvm;

     

       5383
       5379
        
         llvm_15 = llvmPackages_15.llvm;

     

       5384
       5380
        
         llvm_16 = llvmPackages_16.llvm;

     
···

       5398
       5394
        
           (rec {

     

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

     

       5400
       5396
        
       

     

       5401
       5401
       -
             llvmPackages_13 = llvmPackagesSet."13";

     

       5402
       5397
        
             llvmPackages_14 = llvmPackagesSet."14";

     

       5403
       5398
        
             llvmPackages_15 = llvmPackagesSet."15";

     

       5404
       5399
        
             llvmPackages_16 = llvmPackagesSet."16";

     
···

       5435
       5430
        
       

     

       5436
       5431
        
             mkLLVMPackages = llvmPackagesSet.mkPackage;

     

       5437
       5432
        
           })

     

       5438
       5438
       -
           llvmPackages_13

     

       5439
       5433
        
           llvmPackages_14

     

       5440
       5434
        
           llvmPackages_15

     

       5441
       5435
        
           llvmPackages_16