commit f77e9a221df52340b3c1e89641cc912febc0e9f1 · pyrox.dev/nixpkgs

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, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.

     

       30
       30
       +
       

     

       29
       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.

     

       30
       32
        
       

     

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

-44

pkgs/by-name/bf/bfc/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         rustPlatform,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         llvmPackages_13,

     

       6
       6
       -
         libxml2,

     

       7
       7
       -
         ncurses,

     

       8
       8
       -
         zlib,

     

       9
       9
       -
         stdenv,

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       rustPlatform.buildRustPackage rec {

     

       13
       13
       -
         pname = "bfc";

     

       14
       14
       -
         version = "1.12.0";

     

       15
       15
       -
       

     

       16
       16
       -
         src = fetchFromGitHub {

     

       17
       17
       -
           owner = "Wilfred";

     

       18
       18
       -
           repo = "bfc";

     

       19
       19
       -
           rev = version;

     

       20
       20
       -
           hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU=";

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         cargoHash = "sha256-S8Fy0PRSUftljcX34Sj8MmlPW7Oob2yayPUA1RRxf8E=";

     

       24
       24
       -
       

     

       25
       25
       -
         buildInputs = [

     

       26
       26
       -
           libxml2

     

       27
       27
       -
           ncurses

     

       28
       28
       -
           zlib

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       31
       -
         env.LLVM_SYS_130_PREFIX = llvmPackages_13.llvm.dev;

     

       32
       32
       -
       

     

       33
       33
       -
         # process didn't exit successfully: <...> SIGSEGV

     

       34
       34
       -
         doCheck = false;

     

       35
       35
       -
       

     

       36
       36
       -
         meta = with lib; {

     

       37
       37
       -
           description = "Industrial-grade brainfuck compiler";

     

       38
       38
       -
           mainProgram = "bfc";

     

       39
       39
       -
           homepage = "https://bfc.wilfred.me.uk";

     

       40
       40
       -
           license = licenses.gpl2Plus;

     

       41
       41
       -
           maintainers = with maintainers; [ figsoda ];

     

       42
       42
       -
           broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux;

     

       43
       43
       -
         };

     

       44
       44
       -
       }

-53

pkgs/by-name/da/dale/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         pkg-config,

     

       7
       7
       -
         libffi,

     

       8
       8
       -
         llvm_13,

     

       9
       9
       -
         perl,

     

       10
       10
       -
       }:

     

       11
       11
       -
       

     

       12
       12
       -
       stdenv.mkDerivation {

     

       13
       13
       -
         pname = "dale";

     

       14
       14
       -
         version = "20220411";

     

       15
       15
       -
       

     

       16
       16
       -
         src = fetchFromGitHub {

     

       17
       17
       -
           owner = "tomhrr";

     

       18
       18
       -
           repo = "dale";

     

       19
       19
       -
           rev = "7386ef2d8912c60c6fb157a1e5cd772e15eaf658";

     

       20
       20
       -
           sha256 = "sha256-LNWqrFuEjtL7zuPTBfe4qQWr8IrT/ldQWSeDTK3Wqmo=";

     

       21
       21
       -
         };

     

       22
       22
       -
       

     

       23
       23
       -
         nativeBuildInputs = [

     

       24
       24
       -
           cmake

     

       25
       25
       -
           pkg-config

     

       26
       26
       -
           llvm_13.dev

     

       27
       27
       -
         ];

     

       28
       28
       -
         buildInputs = [

     

       29
       29
       -
           libffi

     

       30
       30
       -
           llvm_13

     

       31
       31
       -
         ];

     

       32
       32
       -
       

     

       33
       33
       -
         nativeCheckInputs = [ perl ];

     

       34
       34
       -
       

     

       35
       35
       -
         checkTarget = "tests";

     

       36
       36
       -
       

     

       37
       37
       -
         meta = with lib; {

     

       38
       38
       -
           description = "Lisp-flavoured C";

     

       39
       39
       -
           longDescription = ''

     

       40
       40
       -
             Dale is a system (no GC) programming language that uses

     

       41
       41
       -
             S-expressions for syntax and supports syntactic macros.

     

       42
       42
       -
           '';

     

       43
       43
       -
           homepage = "https://github.com/tomhrr/dale";

     

       44
       44
       -
           license = licenses.bsd3;

     

       45
       45
       -
           maintainers = with maintainers; [ amiloradovsky ];

     

       46
       46
       -
           platforms = [

     

       47
       47
       -
             "i686-linux"

     

       48
       48
       -
             "x86_64-linux"

     

       49
       49
       -
             "aarch64-linux"

     

       50
       50
       -
           ];

     

       51
       51
       -
           # failed on Darwin: linker couldn't find the FFI lib

     

       52
       52
       -
         };

     

       53
       53
       -
       }

-64

pkgs/by-name/ho/hobbes/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         llvmPackages,

     

       5
       5
       -
         fetchFromGitHub,

     

       6
       6
       -
         cmake,

     

       7
       7
       -
         llvm_12,

     

       8
       8
       -
         ncurses,

     

       9
       9
       -
         readline,

     

       10
       10
       -
         zlib,

     

       11
       11
       -
         libxml2,

     

       12
       12
       -
         python3,

     

       13
       13
       -
       }:

     

       14
       14
       -
       llvmPackages.stdenv.mkDerivation {

     

       15
       15
       -
         pname = "hobbes";

     

       16
       16
       -
         version = "0-unstable-2025-04-23";

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "morganstanley";

     

       20
       20
       -
           repo = "hobbes";

     

       21
       21
       -
           rev = "0829030be03d47f91075cbebd0c9565f44bf9911";

     

       22
       22
       -
           hash = "sha256-GZ26XL4++2MWQED2tVWeJ8HFcFQUXnXZ3+JCgdlAXNo=";

     

       23
       23
       -
         };

     

       24
       24
       -
       

     

       25
       25
       -
         CXXFLAGS = [

     

       26
       26
       -
           "-Wno-error=missing-template-arg-list-after-template-kw"

     

       27
       27
       -
           "-Wno-error=deprecated-copy"

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         nativeBuildInputs = [

     

       31
       31
       -
           cmake

     

       32
       32
       -
         ];

     

       33
       33
       -
       

     

       34
       34
       -
         buildInputs = [

     

       35
       35
       -
           llvm_12

     

       36
       36
       -
           ncurses

     

       37
       37
       -
           readline

     

       38
       38
       -
           zlib

     

       39
       39
       -
           libxml2

     

       40
       40
       -
           python3

     

       41
       41
       -
         ];

     

       42
       42
       -
       

     

       43
       43
       -
         doCheck = true;

     

       44
       44
       -
         checkTarget = "test";

     

       45
       45
       -
       

     

       46
       46
       -
         meta = with lib; {

     

       47
       47
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       48
       48
       -
           description = "Language and an embedded JIT compiler";

     

       49
       49
       -
           longDescription = ''

     

       50
       50
       -
             Hobbes is a a language, embedded compiler, and runtime for efficient

     

       51
       51
       -
             dynamic expression evaluation, data storage and analysis.

     

       52
       52
       -
           '';

     

       53
       53
       -
           homepage = "https://github.com/morganstanley/hobbes";

     

       54
       54
       -
           license = licenses.asl20;

     

       55
       55
       -
           maintainers = with maintainers; [

     

       56
       56
       -
             kthielen

     

       57
       57
       -
             thmzlt

     

       58
       58
       -
           ];

     

       59
       59
       -
           platforms = [

     

       60
       60
       -
             "x86_64-linux"

     

       61
       61
       -
             "x86_64-darwin"

     

       62
       62
       -
           ];

     

       63
       63
       -
         };

     

       64
       64
       -
       }

-42

pkgs/by-name/oc/oclgrind/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         llvmPackages_13,

     

       7
       7
       -
         readline,

     

       8
       8
       -
         python3,

     

       9
       9
       -
       }:

     

       10
       10
       -
       

     

       11
       11
       -
       stdenv.mkDerivation rec {

     

       12
       12
       -
         pname = "oclgrind";

     

       13
       13
       -
         version = "21.10";

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchFromGitHub {

     

       16
       16
       -
           owner = "jrprice";

     

       17
       17
       -
           repo = "oclgrind";

     

       18
       18
       -
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow=";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         nativeBuildInputs = [ cmake ];

     

       23
       23
       -
         nativeCheckInputs = [ python3 ];

     

       24
       24
       -
         buildInputs = [

     

       25
       25
       -
           llvmPackages_13.llvm

     

       26
       26
       -
           llvmPackages_13.clang-unwrapped

     

       27
       27
       -
           readline

     

       28
       28
       -
         ];

     

       29
       29
       -
       

     

       30
       30
       -
         cmakeFlags = [

     

       31
       31
       -
           "-DCLANG_ROOT=${llvmPackages_13.clang-unwrapped}"

     

       32
       32
       -
           (lib.cmakeBool "CMAKE_SKIP_RPATH" true)

     

       33
       33
       -
         ];

     

       34
       34
       -
       

     

       35
       35
       -
         meta = with lib; {

     

       36
       36
       -
           description = "OpenCL device simulator and debugger";

     

       37
       37
       -
           homepage = "https://github.com/jrprice/oclgrind";

     

       38
       38
       -
           license = licenses.bsd3;

     

       39
       39
       -
           platforms = platforms.linux;

     

       40
       40
       -
           maintainers = with maintainers; [ athas ];

     

       41
       41
       -
         };

     

       42
       42
       -
       }

-45

pkgs/by-name/qr/qrscan/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         clang_15,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         rustPlatform,

     

       5
       5
       -
         fetchFromGitHub,

     

       6
       6
       -
         stdenv,

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       rustPlatform.buildRustPackage rec {

     

       10
       10
       -
         pname = "qrscan";

     

       11
       11
       -
         version = "0.1.9";

     

       12
       12
       -
       

     

       13
       13
       -
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "sayanarijit";

     

       15
       15
       -
           repo = "qrscan";

     

       16
       16
       -
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-nAUZUE7NppsCAV8UyR8+OkikT4nJtnamsSVeyNz21EQ=";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         nativeBuildInputs = [

     

       21
       21
       -
           (rustPlatform.bindgenHook.overrideAttrs {

     

       22
       22
       -
             libclang = clang_15.cc.lib;

     

       23
       23
       -
           })

     

       24
       24
       -
         ];

     

       25
       25
       -
       

     

       26
       26
       -
         cargoHash = "sha256-hBDB/Cp8JTk9hF3qDBCb7LicUZdpXHm2i2dsuw5geO4=";

     

       27
       27
       -
       

     

       28
       28
       -
         checkFlags = [

     

       29
       29
       -
           # requires filesystem write access

     

       30
       30
       -
           "--skip=tests::test_export_files"

     

       31
       31
       -
           "--skip=tests::test_scan_from_stdin"

     

       32
       32
       -
           "--skip=tests::test_scan_jpeg_file"

     

       33
       33
       -
           "--skip=tests::test_scan_no_content"

     

       34
       34
       -
           "--skip=tests::test_scan_png_file"

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         meta = with lib; {

     

       38
       38
       -
           description = "Scan a QR code in the terminal using the system camera or a given image";

     

       39
       39
       -
           mainProgram = "qrscan";

     

       40
       40
       -
           homepage = "https://github.com/sayanarijit/qrscan";

     

       41
       41
       -
           license = licenses.mit;

     

       42
       42
       -
           broken = stdenv.hostPlatform.isDarwin;

     

       43
       43
       -
           maintainers = [ maintainers.sayanarijit ];

     

       44
       44
       -
         };

     

       45
       45
       -
       }

+6 -5

pkgs/by-name/sh/shader-slang/package.nix

···

       11
       11
        
         libX11,

     

       12
       12
        
         glslang,

     

       13
       13
        
         unordered_dense,

     

       14
       14
       -
         llvmPackages_14,

     

       14
       14
       +
         llvmPackages,

     

       15
       15
        
         versionCheckHook,

     

       16
       16
        
         gitUpdater,

     

       17
       17
        
       

     
···

       73
       73
        
           libX11

     

       74
       74
        
         ]

     

       75
       75
        
         ++ lib.optionals withLLVM [

     

       76
       76
       -
           # Slang only supports LLVM 14:

     

       77
       77
       -
           # https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support

     

       78
       78
       -
           llvmPackages_14.llvm

     

       79
       79
       -
           llvmPackages_14.libclang

     

       76
       76
       +
           llvmPackages.llvm

     

       77
       77
       +
           llvmPackages.libclang

     

       80
       78
        
         ]

     

       81
       79
        
         ++ lib.optionals withGlslang [

     

       82
       80
        
           # SPIRV-tools is included in glslang.

     
···

       150
       148
        
           maintainers = with lib.maintainers; [ niklaskorz ];

     

       151
       149
        
           mainProgram = "slangc";

     

       152
       150
        
           platforms = lib.platforms.all;

     

       151
       151
       +
           # Slang only supports LLVM 14:

     

       152
       152
       +
           # https://github.com/shader-slang/slang/blob/v2025.15/docs/building.md#llvm-support

     

       153
       153
       +
           broken = withLLVM;

     

       153
       154
        
         };

     

       154
       155
        
       })

+2 -28

pkgs/by-name/sp/spirv-llvm-translator/package.nix

···

       36
       36
        
             rev = "v${version}";

     

       37
       37
        
             hash = "sha256-rt3RTZut41uDEh0YmpOzH3sOezeEVWtAIGMKCHLSJBw=";

     

       38
       38
        
           };

     

       39
       39
       -
           "17" = rec {

     

       40
       40
       -
             version = "17.0.15";

     

       41
       41
       -
             rev = "v${version}";

     

       42
       42
       -
             hash = "sha256-ETpTQYMMApECDfuRY87HrO/PUxZ13x9dBRJ3ychslUI=";

     

       43
       43
       -
           };

     

       44
       44
       -
           "16" = rec {

     

       45
       45
       -
             version = "16.0.15";

     

       46
       46
       -
             rev = "v${version}";

     

       47
       47
       -
             hash = "sha256-30i73tGl+1KlP92XA0uxdMTydd9EtaQ4SZ0W1kdm1fQ=";

     

       48
       48
       -
           };

     

       49
       49
       -
           "15" = rec {

     

       50
       50
       -
             version = "15.0.15";

     

       51
       51
       -
             rev = "v${version}";

     

       52
       52
       -
             hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";

     

       53
       53
       -
           };

     

       54
       54
       -
           "14" = rec {

     

       55
       55
       -
             version = "14.0.14";

     

       56
       56
       -
             rev = "v${version}";

     

       57
       57
       -
             hash = "sha256-PW+5w93omLYPZXjRtU4BNY2ztZ86pcjgUQZkrktMq+4=";

     

       58
       58
       -
           };

     

       59
       39
        
         };

     

       60
       40
        
       

     

       61
       41
        
         branch = versions."${llvmMajor}" or (throw "Incompatible LLVM version ${llvmMajor}");

     
···

       70
       50
        
           inherit (branch) rev hash;

     

       71
       51
        
         };

     

       72
       52
        
       

     

       73
       73
       -
         patches = lib.optionals (llvmMajor == "14") [

     

       74
       74
       -
           (fetchpatch {

     

       75
       75
       -
             # tries to install llvm-spirv into llvm nix store path

     

       76
       76
       -
             url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/cce9a2f130070d799000cac42fe24789d2b777ab.patch";

     

       77
       77
       -
             revert = true;

     

       78
       78
       -
             hash = "sha256-GbFacttZRDCgA0jkUoFA4/B3EDn3etweKvM09OwICJ8=";

     

       79
       79
       -
           })

     

       80
       80
       -
         ];

     

       53
       53
       +
         # TODO: Remove.

     

       54
       54
       +
         patches = [ ];

     

       81
       55
        
       

     

       82
       56
        
         nativeBuildInputs = [

     

       83
       57
        
           pkg-config

-32

pkgs/by-name/wa/wavm/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         llvmPackages_12,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       llvmPackages_12.stdenv.mkDerivation (finalAttrs: {

     

       9
       9
       -
         pname = "wavm";

     

       10
       10
       -
         version = "2022-05-14";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "WAVM";

     

       14
       14
       -
           repo = "WAVM";

     

       15
       15
       -
           rev = "nightly/${finalAttrs.version}";

     

       16
       16
       -
           hash = "sha256-SHz+oOOkwvVZucJYFSyZc3MnOAy1VatspmZmOAXYAWA=";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         nativeBuildInputs = [

     

       20
       20
       -
           cmake

     

       21
       21
       -
           llvmPackages_12.llvm

     

       22
       22
       -
         ];

     

       23
       23
       -
       

     

       24
       24
       -
         meta = with lib; {

     

       25
       25
       -
           description = "WebAssembly Virtual Machine";

     

       26
       26
       -
           mainProgram = "wavm";

     

       27
       27
       -
           homepage = "https://wavm.github.io";

     

       28
       28
       -
           license = licenses.bsd3;

     

       29
       29
       -
           maintainers = with maintainers; [ ereslibre ];

     

       30
       30
       -
           platforms = platforms.unix;

     

       31
       31
       -
         };

     

       32
       32
       -
       })

-44

pkgs/development/compilers/cone/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         llvmPackages,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
       }:

     

       7
       7
       -
       

     

       8
       8
       -
       llvmPackages.stdenv.mkDerivation rec {

     

       9
       9
       -
         pname = "cone";

     

       10
       10
       -
         version = "unstable-2022-12-12";

     

       11
       11
       -
       

     

       12
       12
       -
         src = fetchFromGitHub {

     

       13
       13
       -
           owner = "jondgoodwin";

     

       14
       14
       -
           repo = pname;

     

       15
       15
       -
           rev = "698bd6afc75777eabbc8ef576d64d683c6a1c5ab";

     

       16
       16
       -
           sha256 = "0y2s9xgkci8n72v6gnc1i7shr2y3g2sa8fbr25gpxa9ipiq9khg7";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         nativeBuildInputs = [ cmake ];

     

       20
       20
       -
       

     

       21
       21
       -
         buildInputs = [

     

       22
       22
       -
           llvmPackages.llvm

     

       23
       23
       -
         ];

     

       24
       24
       -
       

     

       25
       25
       -
         # M68k is an experimental target, so not enabled by default

     

       26
       26
       -
         postPatch = ''

     

       27
       27
       -
           sed -i CMakeLists.txt \

     

       28
       28
       -
               -e '/M68k/d'

     

       29
       29
       -
         '';

     

       30
       30
       -
       

     

       31
       31
       -
         installPhase = ''

     

       32
       32
       -
           install -Dm755 conec $out/bin/conec

     

       33
       33
       -
           install -Dm644 libconestd.a $out/lib/libconestd.a

     

       34
       34
       -
         '';

     

       35
       35
       -
       

     

       36
       36
       -
         meta = with lib; {

     

       37
       37
       -
           description = "Cone Programming Language";

     

       38
       38
       -
           mainProgram = "conec";

     

       39
       39
       -
           homepage = "https://cone.jondgoodwin.com";

     

       40
       40
       -
           license = licenses.mit;

     

       41
       41
       -
           maintainers = with maintainers; [ ];

     

       42
       42
       -
           platforms = platforms.all;

     

       43
       43
       -
         };

     

       44
       44
       -
       }

pkgs/development/compilers/fpc/default.nix

···

       111
       111
        
             lgpl2

     

       112
       112
        
           ];

     

       113
       113
        
           platforms = platforms.unix;

     

       114
       114
       +
           # See:

     

       115
       115
       +
           # * <https://gitlab.com/freepascal.org/fpc/source/-/issues/41045>

     

       116
       116
       +
           # * <https://gitlab.com/freepascal.org/fpc/source/-/merge_requests/887>

     

       117
       117
       +
           broken = stdenv.cc.isClang && stdenv.hostPlatform.isx86_64;

     

       114
       118
        
         };

     

       115
       119
        
       }

pkgs/development/compilers/ghc/common-hadrian.nix

···

       888
       888
        
             timeout = 24 * 3600;

     

       889
       889
        
             platforms = lib.platforms.all;

     

       890
       890
        
             inherit (bootPkgs.ghc.meta) license;

     

       891
       891
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       892
       892
       +
             broken = useLLVM;

     

       891
       893
        
           };

     

       892
       894
        
       

     

       893
       895
        
           dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm;

pkgs/development/compilers/ghc/common-make-native-bignum.nix

···

       669
       669
        
             timeout = 24 * 3600;

     

       670
       670
        
             platforms = lib.platforms.all;

     

       671
       671
        
             inherit (bootPkgs.ghc.meta) license;

     

       672
       672
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       673
       673
       +
             broken = useLLVM;

     

       672
       674
        
           };

     

       673
       675
        
       

     

       674
       676
        
         }

-235

pkgs/development/compilers/llvm/12/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})

-28

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

···

       1
       1
       -
       From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Thu, 18 May 2017 11:56:12 -0500

     

       4
       4
       -
       Subject: [PATCH] "purity" patch for 5.0

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/Driver/ToolChains/Gnu.cpp | 7 -------

     

       8
       8
       -
        1 file changed, 7 deletions(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

     

       11
       11
       -
       index fe3c0191bb..c6a482bece 100644

     

       12
       12
       -
       --- a/lib/Driver/ToolChains/Gnu.cpp

     

       13
       13
       -
       +++ b/lib/Driver/ToolChains/Gnu.cpp

     

       14
       14
       -
       @@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

     

       15
       15
       -
          if (!IsStatic) {

     

       16
       16
       -
            if (Args.hasArg(options::OPT_rdynamic))

     

       17
       17
       -
              CmdArgs.push_back("-export-dynamic");

     

       18
       18
       -
       -

     

       19
       19
       -
       -    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {

     

       20
       20
       -
       -      CmdArgs.push_back("-dynamic-linker");

     

       21
       21
       -
       -      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

     

       22
       22
       -
       -                                           ToolChain.getDynamicLinker(Args)));

     

       23
       23
       -
       -    }

     

       24
       24
       -
          }

     

       25
       25
       -
        

     

       26
       26
       -
          CmdArgs.push_back("-o");

     

       27
       27
       -
       -- 

     

       28
       28
       -
       2.11.0

-21

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

···

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

     

       2
       2
       -
       index 3a66dd9c3fb..7efc85d9f9f 100644

     

       3
       3
       -
       --- a/lib/builtins/CMakeLists.txt

     

       4
       4
       -
       +++ b/lib/builtins/CMakeLists.txt

     

       5
       5
       -
       @@ -345,4 +345,8 @@ if (NOT MSVC)

     

       6
       6
       -
        

     

       7
       7
       -
       +  set(i486_SOURCES ${i386_SOURCES})

     

       8
       8
       -
       +  set(i586_SOURCES ${i386_SOURCES})

     

       9
       9
       -
       +  set(i686_SOURCES ${i386_SOURCES})

     

       10
       10
       -
       +

     

       11
       11
       -
          if (WIN32)

     

       12
       12
       -
            set(i386_SOURCES

     

       13
       13
       -
              ${i386_SOURCES}

     

       14
       14
       -
       @@ -608,6 +612,7 @@ else ()

     

       15
       15
       -
          endif()

     

       16
       16
       -
        

     

       17
       17
       -
          foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       18
       18
       -
       +      message("arch: ${arch}")

     

       19
       19
       -
            if (CAN_TARGET_${arch})

     

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

     

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

-32

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

···

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

     

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

     

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

     

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

     

       5
       5
       -
        

     

       6
       6
       -
        

     

       7
       7
       -
        set(ARM64 aarch64)

     

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

     

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

     

       10
       10
       -
        set(HEXAGON hexagon)

     

       11
       11
       -
        set(X86 i386)

     

       12
       12
       -
        set(X86_64 x86_64)

     

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

     

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

     

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

     

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

     

       17
       17
       -
        set(armv7_SOURCES ${arm_SOURCES})

     

       18
       18
       -
        set(armv7s_SOURCES ${arm_SOURCES})

     

       19
       19
       -
        set(armv7k_SOURCES ${arm_SOURCES})

     

       20
       20
       -
       +set(armv7l_SOURCES ${arm_SOURCES})

     

       21
       21
       -
        set(arm64_SOURCES ${aarch64_SOURCES})

     

       22
       22
       -
        

     

       23
       23
       -
        # macho_embedded archs

     

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

     

       25
       25
       -
          foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       26
       26
       -
            if (CAN_TARGET_${arch})

     

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

     

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

     

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

     

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

     

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

     

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

-33

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

···

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

     

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

     

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

     

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

     

       5
       5
       -
        needs it

     

       6
       6
       -
       

     

       7
       7
       -
       ---

     

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

     

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

     

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

     

       11
       11
       -
        3 files changed, 107 deletions(-)

     

       12
       12
       -
       

     

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

     

       14
       14
       -
       index bc5fb9ff7..b64eb4246 100644

     

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

     

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

     

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

     

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

     

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

     

       20
       20
       -
              endif()

     

       21
       21
       -
       -      if(APPLE)

     

       22
       22
       -
       -        # Ad-hoc sign the dylibs

     

       23
       23
       -
       -        add_custom_command(TARGET ${libname}

     

       24
       24
       -
       -          POST_BUILD  

     

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

     

       26
       26
       -
       -          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}

     

       27
       27
       -
       -        )

     

       28
       28
       -
       -      endif()

     

       29
       29
       -
            endif()

     

       30
       30
       -
            install(TARGETS ${libname}

     

       31
       31
       -
              ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}

     

       32
       32
       -
       2.14.1

     

       33
       33
       -

-129

pkgs/development/compilers/llvm/12/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})

-16

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

···

       1
       1
       -
       diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake

     

       2
       2
       -
       index f1f46fb9599c..6f19e69507ba 100644

     

       3
       3
       -
       --- a/cmake/Modules/CompilerRTUtils.cmake

     

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

     

       5
       5
       -
       @@ -302,8 +302,9 @@ macro(load_llvm_config)

     

       6
       6
       -
            # Get some LLVM variables from LLVMConfig.

     

       7
       7
       -
            include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake")

     

       8
       8
       -
        

     

       9
       9
       -
       -    set(LLVM_LIBRARY_OUTPUT_INTDIR

     

       10
       10
       -
       -      ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})

     

       11
       11
       -
       +    get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR

     

       12
       12
       -
       +      ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}

     

       13
       13
       -
       +      REALPATH)

     

       14
       14
       -
          endif()

     

       15
       15
       -
        endmacro()

     

       16
       16
       -

-34

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

···

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

     

       2
       2
       -
       index 48cb8e004e08..fec8144fb95a 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 12.0.0)

     

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

     

       14
       14
       -
       @@ -115,17 +117,17 @@ 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}/c++)

     

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

     

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

     

       20
       20
       -
          if(LIBCXX_LIBDIR_SUBDIR)

     

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

     

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

     

       23
       23
       -
          endif()

     

       24
       24
       -
        elseif(LLVM_LIBRARY_OUTPUT_INTDIR)

     

       25
       25
       -
          set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})

     

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

     

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

     

       28
       28
       -
        else()

     

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

     

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

     

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

     

       32
       32
       -
        endif()

     

       33
       33
       -
        

     

       34
       34
       -
        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBUNWIND_LIBRARY_DIR})

-68

pkgs/development/compilers/llvm/12/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/12/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 19:08:14.241656491 -0700

     

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

     

       96
       96
       -
       @@ -113,14 +113,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}")

-31

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

···

       1
       1
       -
       --- a/source/Plugins/Process/Linux/Procfs.h

     

       2
       2
       -
       +++ b/source/Plugins/Process/Linux/Procfs.h

     

       3
       3
       -
       @@ -11,21 +11,12 @@

     

       4
       4
       -
        // sys/procfs.h on Android/Linux for all supported architectures.

     

       5
       5
       -
        

     

       6
       6
       -
        #include <sys/ptrace.h>

     

       7
       7
       -
       +#include <asm/ptrace.h>

     

       8
       8
       -
        

     

       9
       9
       -
       -#ifdef __ANDROID__

     

       10
       10
       -
       -#if defined(__arm64__) || defined(__aarch64__)

     

       11
       11
       -
       -typedef unsigned long elf_greg_t;

     

       12
       12
       -
       -typedef elf_greg_t

     

       13
       13
       -
       -    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];

     

       14
       14
       -
       -typedef struct user_fpsimd_state elf_fpregset_t;

     

       15
       15
       -
       -#ifndef NT_FPREGSET

     

       16
       16
       -
       -#define NT_FPREGSET NT_PRFPREG

     

       17
       17
       -
       -#endif // NT_FPREGSET

     

       18
       18
       -
       -#elif defined(__mips__)

     

       19
       19
       -
       -#ifndef NT_FPREGSET

     

       20
       20
       -
       -#define NT_FPREGSET NT_PRFPREG

     

       21
       21
       -
       -#endif // NT_FPREGSET

     

       22
       22
       -
       -#endif

     

       23
       23
       -
       -#else // __ANDROID__

     

       24
       24
       -
       +#if !defined(__GLIBC__) && defined(__powerpc__)

     

       25
       25
       -
       +#define pt_regs musl_pt_regs

     

       26
       26
       -
       +#include <sys/procfs.h>

     

       27
       27
       -
       +#undef pt_regs

     

       28
       28
       -
       +#else

     

       29
       29
       -
        #include <sys/procfs.h>

     

       30
       30
       -
       -#endif // __ANDROID__

     

       31
       31
       -
       +#endif

-13

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

···

       1
       1
       -
       diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake

     

       2
       2
       -
       index 37364341ff8b..7f74c1a3e257 100644

     

       3
       3
       -
       --- a/cmake/modules/LLDBConfig.cmake

     

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

     

       5
       5
       -
       @@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers)

     

       6
       6
       -
          # Iterate over the possible places where the external resource directory

     

       7
       7
       -
          # could be and pick the first that exists.

     

       8
       8
       -
          foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"

     

       9
       9
       -
       -                    "${LLVM_BUILD_LIBRARY_DIR}"

     

       10
       10
       -
       +                    "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@"

     

       11
       11
       -
                            "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}")

     

       12
       12
       -
            # Build the resource directory path by appending 'clang/<version number>'.

     

       13
       13
       -
            set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}")

-13

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

···

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

     

       2
       2
       -
       index eb924282..c77c140b 100644

     

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

     

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

     

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

     

       6
       6
       -
          Support

     

       7
       7
       -
          Target

     

       8
       8
       -
          )

     

       9
       9
       -
       +

     

       10
       10
       -
       +if (CMAKE_COMPILER_IS_GNUCXX)

     

       11
       11
       -
       +  set_source_files_properties(DwarfCompileUnit.cpp PROPERTIES

     

       12
       12
       -
       +                              COMPILE_FLAGS -fno-strict-aliasing)

     

       13
       13
       -
       +endif()

-105

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

···

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

     

       2
       2
       -
       index ca7c04c565bb..6ed5db5dd4f8 100644

     

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

     

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

     

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

     

       6
       6
       -
        if (NOT DEFINED LLVM_MAIN_SRC_DIR)

     

       7
       7
       -
          project(Polly)

     

       8
       8
       -
          cmake_minimum_required(VERSION 3.13.4)

     

       9
       9
       -
       +endif()

     

       10
       10
       -
       +

     

       11
       11
       -
       +include(GNUInstallDirs)

     

       12
       12
       -
        

     

       13
       13
       -
       +if (NOT DEFINED LLVM_MAIN_SRC_DIR)

     

       14
       14
       -
          # Where is LLVM installed?

     

       15
       15
       -
          find_package(LLVM CONFIG REQUIRED)

     

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

     

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

     

       18
       18
       -
        

     

       19
       19
       -
        if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

     

       20
       20
       -
          install(DIRECTORY include/

     

       21
       21
       -
       -    DESTINATION include

     

       22
       22
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       23
       23
       -
            FILES_MATCHING

     

       24
       24
       -
            PATTERN "*.h"

     

       25
       25
       -
            )

     

       26
       26
       -
        

     

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

     

       28
       28
       -
       -    DESTINATION include

     

       29
       29
       -
       +    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

     

       30
       30
       -
            FILES_MATCHING

     

       31
       31
       -
            PATTERN "*.h"

     

       32
       32
       -
            PATTERN "CMakeFiles" EXCLUDE

     

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

     

       34
       34
       -
       index 7cc129ba2e90..137be25e4b80 100644

     

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

     

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

     

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

     

       38
       38
       -
        

     

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

     

       40
       40
       -
        unset(POLLY_EXPORTS)

     

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

     

       42
       42
       -
       +set(POLLY_INSTALL_PREFIX "")

     

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

     

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

     

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

     

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

     

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

     

       48
       48
       -
        if (POLLY_BUNDLED_ISL)

     

       49
       49
       -
          set(POLLY_CONFIG_INCLUDE_DIRS

     

       50
       50
       -
       -    "${POLLY_INSTALL_PREFIX}/include"

     

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

     

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

     

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

     

       54
       54
       -
            )

     

       55
       55
       -
        else()

     

       56
       56
       -
          set(POLLY_CONFIG_INCLUDE_DIRS

     

       57
       57
       -
       -    "${POLLY_INSTALL_PREFIX}/include"

     

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

     

       59
       59
       -
            ${ISL_INCLUDE_DIRS}

     

       60
       60
       -
            )

     

       61
       61
       -
        endif()

     

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

     

       63
       63
       -
        foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS)

     

       64
       64
       -
          get_target_property(tgt_type ${tgt} TYPE)

     

       65
       65
       -
          if (tgt_type STREQUAL "EXECUTABLE")

     

       66
       66
       -
       -    set(tgt_prefix "bin/")

     

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

     

       68
       68
       -
          else()

     

       69
       69
       -
       -    set(tgt_prefix "lib/")

     

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

     

       71
       71
       -
          endif()

     

       72
       72
       -
        

     

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

     

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

     

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

     

       76
       76
       -
        

     

       77
       77
       -
          if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY")

     

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

     

       79
       79
       -
       index 518a09b45a42..bd9d6f5542ad 100644

     

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

     

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

     

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

     

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

     

       84
       84
       -
            install(TARGETS ${name}

     

       85
       85
       -
              EXPORT LLVMExports

     

       86
       86
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       87
       87
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

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

     

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

     

       90
       90
       -
          endif()

     

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

     

       92
       92
       -
        endmacro(add_polly_library)

     

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

     

       94
       94
       -
       index 8991094d92c7..178d8ad606bb 100644

     

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

     

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

     

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

     

       98
       98
       -
            install(DIRECTORY

     

       99
       99
       -
              ${ISL_SOURCE_DIR}/include/

     

       100
       100
       -
              ${ISL_BINARY_DIR}/include/

     

       101
       101
       -
       -      DESTINATION include/polly

     

       102
       102
       -
       +      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly

     

       103
       103
       -
              FILES_MATCHING

     

       104
       104
       -
              PATTERN "*.h"

     

       105
       105
       -
              PATTERN "CMakeFiles" EXCLUDE

-417

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

···

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

     

       2
       2
       -
       index 277d0fe54d7b..af69c8be8745 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -256,15 +256,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
       -
       @@ -567,9 +573,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
       -
       @@ -1027,7 +1033,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
       -
       @@ -1038,7 +1044,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
       -
       @@ -1052,13 +1058,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 97c9980c7de3..409e8b615f75 100644

     

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

     

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

     

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

     

       79
       79
       -
        

     

       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
       -
       @@ -1022,7 +1022,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
       -
       @@ -1242,7 +1242,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
       -
       @@ -1854,7 +1854,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
       -
       @@ -1871,7 +1871,7 @@ function(llvm_install_library_symlink name dest type)

     

       119
       119
       -
          endif()

     

       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
       -
       @@ -1894,7 +1894,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
       -
       @@ -1977,7 +1977,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
       -
       @@ -2100,9 +2101,9 @@ function(llvm_setup_rpath name)

     

       147
       147
       -
        

     

       148
       148
       -
          if (APPLE)

     

       149
       149
       -
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

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

     

       151
       151
       -
       +    set(_install_rpath "@loader_path/../${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 505dc9a29d70..36e6c63af3f4 100644

     

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

     

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

     

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

     

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

     

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

     

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

     

       195
       195
       -
        

     

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

     

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

     

       198
       198
       -
          set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE}

     

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

     

       200
       200
       -
        endforeach(p)

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       211
       211
       -
        

     

       212
       212
       -
        # Generate a default location for lit

     

       213
       213
       -
        if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)

     

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

     

       215
       215
       -
       index 09fed8085c23..aa79f192abf0 100644

     

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

     

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

     

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

     

       219
       219
       -
            set(LINK_OR_COPY copy)

     

       220
       220
       -
          endif()

     

       221
       221
       -
        

     

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

     

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

     

       224
       224
       -
        

     

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

     

       226
       226
       -
        

     

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

     

       228
       228
       -
       index bb821b417ad9..6a528f7c2ad3 100644

     

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

     

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

     

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

     

       232
       232
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

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

     

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

     

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

     

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

     

       237
       237
       -
        

     

       238
       238
       -
        **CMAKE_C_FLAGS**:STRING

     

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

     

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

     

       241
       241
       -
        

     

       242
       242
       -
        **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING

     

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

     

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

     

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

     

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

     

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

     

       248
       248
       -
        

     

       249
       249
       -
        **LLVM_ENABLE_SPHINX**:BOOL

     

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

     

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

     

       252
       252
       -
        

     

       253
       253
       -
        **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING

     

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

     

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

     

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

     

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

     

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

     

       259
       259
       -
        

     

       260
       260
       -
        **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING

     

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

     

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

     

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

     

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

     

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

     

       266
       266
       -
       +

     

       267
       267
       -
       +**CMAKE_INSTALL_BINDIR**:STRING

     

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

     

       269
       269
       -
       +  Defaults to `bin`.

     

       270
       270
       -
       +

     

       271
       271
       -
       +**CMAKE_INSTALL_LIBDIR**:STRING

     

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

     

       273
       273
       -
       +  Defaults to `lib`.

     

       274
       274
       -
       +

     

       275
       275
       -
       +**CMAKE_INSTALL_INCLUDEDIR**:STRING

     

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

     

       277
       277
       -
       +  Defaults to `include`.

     

       278
       278
       -
       +

     

       279
       279
       -
       +**CMAKE_INSTALL_DOCDIR**:STRING

     

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

     

       281
       281
       -
       +  Defaults to `share/doc`.

     

       282
       282
       -
       +

     

       283
       283
       -
       +**CMAKE_INSTALL_MANDIR**:STRING

     

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

     

       285
       285
       -
       +  Defaults to `share/man`.

     

       286
       286
       -
        

     

       287
       287
       -
        **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL

     

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

     

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

     

       290
       290
       -
        

     

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

     

       292
       292
       -
        

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       301
       301
       -
        

     

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

     

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

     

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

     

       305
       305
       -
       index bb96edb4b4bf..678c22fb43c8 100644

     

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

     

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

     

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

     

       309
       309
       -
            BUILDTREE_ONLY

     

       310
       310
       -
           )

     

       311
       311
       -
        

     

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

     

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

     

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

     

       315
       315
       -
        endif()

     

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

     

       317
       317
       -
       index b46319f24fc8..2feabd1954e4 100644

     

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

     

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

     

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

     

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

     

       322
       322
       -
        # header files into the build area.

     

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

     

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

     

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

     

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

     

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

     

       328
       328
       -
       index ebe5b73a5c65..70c497be12f5 100644

     

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

     

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

     

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

     

       332
       332
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       333
       333
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       334
       334
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

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

     

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

     

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

     

       339
       339
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       340
       340
       -
        #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"

     

       341
       341
       -
        #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@"

     

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

     

       343
       343
       -
       index 1a2f04552d13..44fa7d3eec6b 100644

     

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

     

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

     

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

     

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

     

       348
       348
       -
          } else {

     

       349
       349
       -
            ActivePrefix = CurrentExecPrefix;

     

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

     

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

     

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

     

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

     

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

     

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

     

       356
       356
       -
       +    {

     

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

     

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

     

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

     

       360
       360
       -
       +    }

     

       361
       361
       -
       +    {

     

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

     

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

     

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

     

       365
       365
       -
       +    }

     

       366
       366
       -
       +    {

     

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

     

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

     

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

     

       370
       370
       -
       +    }

     

       371
       371
       -
       +    {

     

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

     

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

     

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

     

       375
       375
       -
       +    }

     

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

     

       377
       377
       -
          }

     

       378
       378
       -
        

     

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

     

       380
       380
       -
       index 2963f97cad88..69d66c9c9ca1 100644

     

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

     

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

     

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

     

       384
       384
       -
            intrinsics_gen)

     

       385
       385
       -
        

     

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

     

       387
       387
       -
       -  DESTINATION include/llvm-c

     

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

     

       389
       389
       -
          COMPONENT LTO)

     

       390
       390
       -
        

     

       391
       391
       -
        if (APPLE)

     

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

     

       393
       393
       -
       index ead73ec13a8f..250362021f17 100644

     

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

     

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

     

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

     

       397
       397
       -
        

     

       398
       398
       -
        foreach (file ${files})

     

       399
       399
       -
          install(PROGRAMS ${file}

     

       400
       400
       -
       -    DESTINATION share/opt-viewer

     

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

     

       402
       402
       -
            COMPONENT opt-viewer)

     

       403
       403
       -
        endforeach (file)

     

       404
       404
       -
        

     

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

     

       406
       406
       -
       index 865436247270..ce1daa62f6ab 100644

     

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

     

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

     

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

     

       410
       410
       -
          endif()

     

       411
       411
       -
          

     

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

     

       413
       413
       -
       -    DESTINATION include/llvm-c

     

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

     

       415
       415
       -
            COMPONENT Remarks)

     

       416
       416
       -
        

     

       417
       417
       -
          if (APPLE)

-19

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

···

       1
       1
       -
       diff --git a/test/Bindings/Go/lit.local.cfg b/test/Bindings/Go/lit.local.cfg

     

       2
       2
       -
       index 91a0ad89..4da83a1a 100644

     

       3
       3
       -
       --- a/test/Bindings/Go/lit.local.cfg

     

       4
       4
       -
       +++ b/test/Bindings/Go/lit.local.cfg

     

       5
       5
       -
       @@ -1,5 +1,4 @@

     

       6
       6
       -
        import os

     

       7
       7
       -
       -import pipes

     

       8
       8
       -
        import shlex

     

       9
       9
       -
        import sys

     

       10
       10
       -
        

     

       11
       11
       -
       @@ -56,7 +55,7 @@ def fixup_compiler_path(compiler):

     

       12
       12
       -
            except (AttributeError, OSError):

     

       13
       13
       -
                pass

     

       14
       14
       -
        

     

       15
       15
       -
       -    return ' '.join([pipes.quote(arg) for arg in args])

     

       16
       16
       -
       +    return ' '.join([shlex.quote(arg) for arg in args])

     

       17
       17
       -
        

     

       18
       18
       -
        config.environment['CC'] = fixup_compiler_path(config.host_cc)

     

       19
       19
       -
        config.environment['CXX'] = fixup_compiler_path(config.host_cxx)

-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

-31

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

···

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

     

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

     

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

     

       4
       4
       -
       @@ -37,6 +37,6 @@

     

       5
       5
       -
        

     

       6
       6
       -
        set(ARM64 aarch64)

     

       7
       7
       -
       -set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)

     

       8
       8
       -
       +set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)

     

       9
       9
       -
        set(HEXAGON hexagon)

     

       10
       10
       -
        set(X86 i386)

     

       11
       11
       -
        set(X86_64 x86_64)

     

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

     

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

     

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

     

       15
       15
       -
       @@ -555,6 +555,7 @@

     

       16
       16
       -
        set(armv7_SOURCES ${arm_SOURCES})

     

       17
       17
       -
        set(armv7s_SOURCES ${arm_SOURCES})

     

       18
       18
       -
        set(armv7k_SOURCES ${arm_SOURCES})

     

       19
       19
       -
       +set(armv7l_SOURCES ${arm_SOURCES})

     

       20
       20
       -
        set(arm64_SOURCES ${aarch64_SOURCES})

     

       21
       21
       -
        

     

       22
       22
       -
        # macho_embedded archs

     

       23
       23
       -
       @@ -705,7 +705,7 @@

     

       24
       24
       -
          foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       25
       25
       -
            if (CAN_TARGET_${arch})

     

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

     

       27
       27
       -
       -      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

       28
       28
       -
       +      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

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

     

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

     

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

-33

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

···

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

     

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

     

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

     

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

     

       5
       5
       -
        needs it

     

       6
       6
       -
       

     

       7
       7
       -
       ---

     

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

     

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

     

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

     

       11
       11
       -
        3 files changed, 107 deletions(-)

     

       12
       12
       -
       

     

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

     

       14
       14
       -
       index bc69ec95c419..9f100fdcec2f 100644

     

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

     

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

     

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

     

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

     

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

     

       20
       20
       -
              endif()

     

       21
       21
       -
       -      if(APPLE)

     

       22
       22
       -
       -        # Ad-hoc sign the dylibs

     

       23
       23
       -
       -        add_custom_command(TARGET ${libname}

     

       24
       24
       -
       -          POST_BUILD  

     

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

     

       26
       26
       -
       -          WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR}

     

       27
       27
       -
       -        )

     

       28
       28
       -
       -      endif()

     

       29
       29
       -
            endif()

     

       30
       30
       -
        

     

       31
       31
       -
            set(parent_target_arg)

     

       32
       32
       -
       2.14.1

     

       33
       33
       -

-71

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

···

       1
       1
       -
       diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp

     

       2
       2
       -
       --- a/lib/sanitizer_common/sanitizer_mac.cpp

     

       3
       3
       -
       +++ b/lib/sanitizer_common/sanitizer_mac.cpp

     

       4
       4
       -
       @@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {

     

       5
       5
       -
        // Offset example:

     

       6
       6
       -
        // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4

     

       7
       7
       -
        constexpr u16 GetOSMajorKernelOffset() {

     

       8
       8
       -
       -  if (TARGET_OS_OSX) return 4;

     

       9
       9
       -
       -  if (TARGET_OS_IOS || TARGET_OS_TV) return 6;

     

       10
       10
       -
       -  if (TARGET_OS_WATCH) return 13;

     

       11
       11
       -
       +#if TARGET_OS_OSX

     

       12
       12
       -
       +  return 4;

     

       13
       13
       -
       +#endif

     

       14
       14
       -
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       15
       15
       -
       +  return 6;

     

       16
       16
       -
       +#endif

     

       17
       17
       -
       +#if TARGET_OS_WATCH

     

       18
       18
       -
       +  return 13;

     

       19
       19
       -
       +#endif

     

       20
       20
       -
        }

     

       21
       21
       -
        

     

       22
       22
       -
        using VersStr = char[64];

     

       23
       23
       -
       @@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {

     

       24
       24
       -
          u16 os_major = kernel_major - offset;

     

       25
       25
       -
        

     

       26
       26
       -
          const char *format = "%d.0";

     

       27
       27
       -
       -  if (TARGET_OS_OSX) {

     

       28
       28
       -
       -    if (os_major >= 16) {  // macOS 11+

     

       29
       29
       -
       -      os_major -= 5;

     

       30
       30
       -
       -    } else {  // macOS 10.15 and below

     

       31
       31
       -
       -      format = "10.%d";

     

       32
       32
       -
       -    }

     

       33
       33
       -
       +#if TARGET_OS_OSX

     

       34
       34
       -
       +  if (os_major >= 16) {  // macOS 11+

     

       35
       35
       -
       +    os_major -= 5;

     

       36
       36
       -
       +  } else {  // macOS 10.15 and below

     

       37
       37
       -
       +    format = "10.%d";

     

       38
       38
       -
          }

     

       39
       39
       -
       +#endif

     

       40
       40
       -
          return internal_snprintf(vers, sizeof(VersStr), format, os_major);

     

       41
       41
       -
        }

     

       42
       42
       -
        

     

       43
       43
       -
       @@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {

     

       44
       44
       -
        // Aligned versions example:

     

       45
       45
       -
        // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6

     

       46
       46
       -
        static void MapToMacos(u16 *major, u16 *minor) {

     

       47
       47
       -
       -  if (TARGET_OS_OSX)

     

       48
       48
       -
       -    return;

     

       49
       49
       -
       -

     

       50
       50
       -
       -  if (TARGET_OS_IOS || TARGET_OS_TV)

     

       51
       51
       -
       +#if !TARGET_OS_OSX

     

       52
       52
       -
       +#if TARGET_OS_IOS || TARGET_OS_TV

     

       53
       53
       -
            *major += 2;

     

       54
       54
       -
       -  else if (TARGET_OS_WATCH)

     

       55
       55
       -
       +#elif TARGET_OS_WATCH

     

       56
       56
       -
            *major += 9;

     

       57
       57
       -
       -  else

     

       58
       58
       -
       +#else

     

       59
       59
       -
            UNREACHABLE("unsupported platform");

     

       60
       60
       -
       +#endif

     

       61
       61
       -
        

     

       62
       62
       -
          if (*major >= 16) {  // macOS 11+

     

       63
       63
       -
            *major -= 5;

     

       64
       64
       -
       @@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {

     

       65
       65
       -
            *minor = *major;

     

       66
       66
       -
            *major = 10;

     

       67
       67
       -
          }

     

       68
       68
       -
       +#endif

     

       69
       69
       -
        }

     

       70
       70
       -
        

     

       71
       71
       -
        static MacosVersion GetMacosAlignedVersionInternal() {

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

-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}")

-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)

-50

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

···

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

     

       2
       2
       -
       index 9bbbfc032b7d..947bd0da865d 100644

     

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

     

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

     

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

     

       6
       6
       -
                install(TARGETS ${lib}

     

       7
       7
       -
                  COMPONENT ${lib}

     

       8
       8
       -
                  ${export_to_clangtargets}

     

       9
       9
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       10
       10
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       13
       13
       -
                  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       14
       14
       -
       

     

       15
       15
       -
                if (NOT LLVM_ENABLE_IDE)

     

       16
       16
       -
       @@ -175,7 +175,7 @@ endmacro()

     

       17
       17
       -
        macro(add_clang_symlink name dest)

     

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

     

       19
       19
       -
          # Always generate install targets

     

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

     

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

     

       22
       22
       -
        endmacro()

     

       23
       23
       -
       

     

       24
       24
       -
        function(clang_target_link_libraries target type)

     

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

     

       26
       26
       -
       index 078988980c52..14b58614b40a 100644

     

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

     

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

     

       29
       29
       -
       @@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES

     

       30
       30
       -
          FOLDER "Misc"

     

       31
       31
       -
          RUNTIME_OUTPUT_DIRECTORY "${output_dir}")

     

       32
       32
       -
       

     

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

     

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

     

       35
       35
       -
       

     

       36
       36
       -
        install(

     

       37
       37
       -
          FILES ${files} ${generated_files}

     

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

     

       39
       39
       -
       index 4e0647971ab4..68dd67fcc476 100644

     

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

     

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

     

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

     

       43
       43
       -
                  COMPONENT

     

       44
       44
       -
                    libclang-python-bindings

     

       45
       45
       -
                  DESTINATION

     

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

     

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

     

       48
       48
       -
        endforeach()

     

       49
       49
       -
        if(NOT LLVM_ENABLE_IDE)

     

       50
       50
       -
          add_custom_target(libclang-python-bindings)

-65

pkgs/development/compilers/llvm/14/compiler-rt/armv6-scudo-libatomic.patch

···

       1
       1
       -
       From a56bb19a9dc303a50ef12d83cd24c2395bf81076 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Ben Wolsieffer <benwolsieffer@gmail.com>

     

       3
       3
       -
       Date: Wed, 7 Dec 2022 21:25:46 -0500

     

       4
       4
       -
       Subject: [PATCH] [scudo][standalone] Use CheckAtomic to decide to link to

     

       5
       5
       -
        libatomic

     

       6
       6
       -
       

     

       7
       7
       -
       Standalone scudo uses the atomic operation builtin functions, which require

     

       8
       8
       -
       linking to libatomic on some platforms. Currently, this is done in an ad-hoc

     

       9
       9
       -
       manner. MIPS platforms always link to libatomic, and the tests are always linked

     

       10
       10
       -
       to it as well. libatomic is required on base ARMv6 (but not ARMv6K), but it is

     

       11
       11
       -
       currently not linked, causing the build to fail.

     

       12
       12
       -
       

     

       13
       13
       -
       This patch replaces this ad-hoc logic with the CheckAtomic CMake module already

     

       14
       14
       -
       used in other parts of LLVM. The CheckAtomic module checks whether std::atomic

     

       15
       15
       -
       requires libatomic, which is not strictly the same as checking the atomic

     

       16
       16
       -
       builtins, but should have the same results as far as I know. If this is

     

       17
       17
       -
       problematic, a custom version of CheckAtomic could be used to specifically test

     

       18
       18
       -
       the builtins.

     

       19
       19
       -
       ---

     

       20
       20
       -
        compiler-rt/lib/scudo/standalone/CMakeLists.txt       | 7 +++++++

     

       21
       21
       -
        compiler-rt/lib/scudo/standalone/tests/CMakeLists.txt | 4 +---

     

       22
       22
       -
        2 files changed, 8 insertions(+), 3 deletions(-)

     

       23
       23
       -
       

     

       24
       24
       -
       diff --git a/lib/scudo/standalone/CMakeLists.txt b/lib/scudo/standalone/CMakeLists.txt

     

       25
       25
       -
       index ae5c354768c8..eb27374ca520 100644

     

       26
       26
       -
       --- a/lib/scudo/standalone/CMakeLists.txt

     

       27
       27
       -
       +++ b/lib/scudo/standalone/CMakeLists.txt

     

       28
       28
       -
       @@ -1,5 +1,8 @@

     

       29
       29
       -
        add_compiler_rt_component(scudo_standalone)

     

       30
       30
       -
        

     

       31
       31
       -
       +include(DetermineGCCCompatible)

     

       32
       32
       -
       +include(CheckAtomic)

     

       33
       33
       -
       +

     

       34
       34
       -
        include_directories(../.. include)

     

       35
       35
       -
        

     

       36
       36
       -
        set(SCUDO_CFLAGS)

     

       37
       37
       -
       @@ -34,6 +37,10 @@ list(APPEND SCUDO_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro)

     

       38
       38
       -
        

     

       39
       39
       -
        list(APPEND SCUDO_LINK_FLAGS -ffunction-sections -fdata-sections -Wl,--gc-sections)

     

       40
       40
       -
        

     

       41
       41
       -
       +if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)

     

       42
       42
       -
       +  list(APPEND SCUDO_LINK_FLAGS -latomic)

     

       43
       43
       -
       +endif()

     

       44
       44
       -
       +

     

       45
       45
       -
        # We don't use the C++ standard library, so avoid including it by mistake.

     

       46
       46
       -
        append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SCUDO_LINK_FLAGS)

     

       47
       47
       -
        

     

       48
       48
       -
       diff --git a/lib/scudo/standalone/tests/CMakeLists.txt b/lib/scudo/standalone/tests/CMakeLists.txt

     

       49
       49
       -
       index 6d0936cbb5c1..70a5a7e959c1 100644

     

       50
       50
       -
       --- a/lib/scudo/standalone/tests/CMakeLists.txt

     

       51
       51
       -
       +++ b/lib/scudo/standalone/tests/CMakeLists.txt

     

       52
       52
       -
       @@ -38,9 +38,7 @@ set(LINK_FLAGS

     

       53
       53
       -
          ${SANITIZER_TEST_CXX_LIBRARIES}

     

       54
       54
       -
          )

     

       55
       55
       -
        list(APPEND LINK_FLAGS -pthread)

     

       56
       56
       -
       -# Linking against libatomic is required with some compilers

     

       57
       57
       -
       -check_library_exists(atomic __atomic_load_8 "" COMPILER_RT_HAS_LIBATOMIC)

     

       58
       58
       -
       -if (COMPILER_RT_HAS_LIBATOMIC)

     

       59
       59
       -
       +if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)

     

       60
       60
       -
          list(APPEND LINK_FLAGS -latomic)

     

       61
       61
       -
        endif()

     

       62
       62
       -
        

     

       63
       63
       -
       -- 

     

       64
       64
       -
       2.38.1

     

       65
       65
       -

-42

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

···

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

     

       2
       2
       -
       index 3a41aa43e406..f000cee6eae0 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -5,6 +5,8 @@

     

       6
       6
       -
       

     

       7
       7
       -
        cmake_minimum_required(VERSION 3.13.4)

     

       8
       8
       -
       

     

       9
       9
       -
       +include(GNUInstallDirs)

     

       10
       10
       -
       +

     

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

     

       12
       12
       -
        if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)

     

       13
       13
       -
          project(CompilerRT C CXX ASM)

     

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

     

       15
       15
       -
       index d7b0124f3546..3e111146df4d 100644

     

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

     

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

     

       18
       18
       -
       @@ -67,7 +67,7 @@ if (LLVM_TREE_AVAILABLE)

     

       19
       19
       -
        else()

     

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

     

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

     

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

     

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

     

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

     

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

     

       26
       26
       -
          set(COMPILER_RT_INSTALL_PATH "" CACHE PATH

     

       27
       27
       -
       @@ -99,13 +99,13 @@ endif()

     

       28
       28
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       29
       29
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

       30
       30
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib)

     

       31
       31
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)

     

       32
       32
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")

     

       33
       33
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       35
       35
       -
        else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       36
       36
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

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

     

       38
       38
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")

     

       39
       39
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")

     

       40
       40
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       42
       42
       -
        endif()

-21

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

···

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

     

       2
       2
       -
       --- a/CMakeLists.txt

     

       3
       3
       -
       +++ b/CMakeLists.txt

     

       4
       4
       -
       @@ -147,7 +147,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH

     

       5
       5
       -
        

     

       6
       6
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

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

     

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

     

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

     

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

     

       11
       11
       -
          if(LIBCXX_LIBDIR_SUBDIR)

     

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

     

       13
       13
       -
       @@ -159,7 +159,7 @@ else()

     

       14
       14
       -
          else()

     

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

     

       16
       16
       -
          endif()

     

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

     

       18
       18
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

     

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

     

       20
       20
       -
        endif()

     

       21
       21
       -

-13

pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch

···

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

     

       2
       2
       -
       index 9bcc135665d0..d38679ed41e9 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE)

     

       6
       6
       -
       

     

       7
       7
       -
          set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

     

       8
       8
       -
          set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       9
       9
       -
       -  set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       10
       10
       -
       +  set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

       11
       11
       -
       

     

       12
       12
       -
          find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}

     

       13
       13
       -
            NO_DEFAULT_PATH)

-22

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

···

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

     

       2
       2
       -
       index dd2898ce6236..ebbea040ff54 100644

     

       3
       3
       -
       --- a/cmake/modules/AddLLD.cmake

     

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

     

       5
       5
       -
       @@ -18,8 +18,8 @@ macro(add_lld_library name)

     

       6
       6
       -
            install(TARGETS ${name}

     

       7
       7
       -
              COMPONENT ${name}

     

       8
       8
       -
              ${export_to_lldtargets}

     

       9
       9
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       10
       10
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       13
       13
       -
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       14
       14
       -
        

     

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

     

       16
       16
       -
       @@ -62,5 +62,5 @@ endmacro()

     

       17
       17
       -
        macro(add_lld_symlink name dest)

     

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

     

       19
       19
       -
          # Always generate install targets

     

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

     

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

     

       22
       22
       -
        endmacro()

-19

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

···

       1
       1
       -
       This is the one remaining Polly install dirs related change that hasn't made it

     

       2
       2
       -
       into upstream yet; previously this patch file also included:

     

       3
       3
       -
       https://reviews.llvm.org/D117541

     

       4
       4
       -
       

     

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

     

       6
       6
       -
       index 518a09b45a42..bd9d6f5542ad 100644

     

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

     

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

     

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

     

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

     

       11
       11
       -
            install(TARGETS ${name}

     

       12
       12
       -
              EXPORT LLVMExports

     

       13
       13
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       14
       14
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})

     

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

     

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

     

       17
       17
       -
          endif()

     

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

     

       19
       19
       -
        endmacro(add_polly_library)

-220

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

···

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

     

       2
       2
       -
       index fec956091cd5..5a766f5c5d7c 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING

     

       6
       6
       -
            "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')")

     

       7
       7
       -
        mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR)

     

       8
       8
       -
        

     

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

     

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

     

       11
       11
       -
       +

     

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

     

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

     

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

     

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

     

       16
       16
       -
       index fed1fec7d72e..4baed19b9e98 100644

     

       17
       17
       -
       --- a/cmake/modules/AddLLVM.cmake

     

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

     

       19
       19
       -
       @@ -838,8 +838,8 @@ macro(add_llvm_library name)

     

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

     

       21
       21
       -
              install(TARGETS ${name}

     

       22
       22
       -
                      ${export_to_llvmexports}

     

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

     

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

     

       25
       25
       -
       +              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       26
       26
       -
       +              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       27
       27
       -
                      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       28
       28
       -
        

     

       29
       29
       -
              if (NOT LLVM_ENABLE_IDE)

     

       30
       30
       -
       @@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins)

     

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

     

       32
       32
       -
              install(FILES

     

       33
       33
       -
                  ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake

     

       34
       34
       -
       -          DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}

     

       35
       35
       -
       +          DESTINATION ${LLVM_INSTALL_CMAKE_DIR}

     

       36
       36
       -
                  COMPONENT cmake-exports)

     

       37
       37
       -
        

     

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

     

       39
       39
       -
       @@ -1902,7 +1902,7 @@ function(llvm_install_library_symlink name dest type)

     

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

     

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

     

       42
       42
       -
        

     

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

     

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

     

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

     

       46
       46
       -
            set(output_dir bin)

     

       47
       47
       -
          endif()

     

       48
       48
       -
       @@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type)

     

       49
       49
       -
        

     

       50
       50
       -
        endfunction()

     

       51
       51
       -
        

     

       52
       52
       -
       -function(llvm_install_symlink name dest)

     

       53
       53
       -
       +function(llvm_install_symlink name dest output_dir)

     

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

     

       55
       55
       -
          foreach(path ${CMAKE_MODULE_PATH})

     

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

     

       57
       57
       -
       @@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest)

     

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

     

       59
       59
       -
        

     

       60
       60
       -
          install(SCRIPT ${INSTALL_SYMLINK}

     

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

     

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

     

       63
       63
       -
                  COMPONENT ${component})

     

       64
       64
       -
        

     

       65
       65
       -
          if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)

     

       66
       66
       -
       @@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target)

     

       67
       67
       -
            endif()

     

       68
       68
       -
        

     

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

     

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

     

       71
       71
       -
       +      GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR)

     

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

     

       73
       73
       -
            endif()

     

       74
       74
       -
          endif()

     

       75
       75
       -
        endfunction()

     

       76
       76
       -
       @@ -2148,9 +2149,9 @@ function(llvm_setup_rpath name)

     

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

     

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

     

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

     

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

     

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

     

       82
       82
       -
          elseif(UNIX)

     

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

     

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

     

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

     

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

     

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

     

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

     

       89
       89
       -
       index 891c9e6d618c..8d963f3b0069 100644

     

       90
       90
       -
       --- a/cmake/modules/AddOCaml.cmake

     

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

     

       92
       92
       -
       @@ -147,9 +147,9 @@ function(add_ocaml_library name)

     

       93
       93
       -
          endforeach()

     

       94
       94
       -
        

     

       95
       95
       -
          if( APPLE )

     

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

     

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

     

       98
       98
       -
          elseif( UNIX )

     

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

     

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

     

       101
       101
       -
          endif()

     

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

     

       103
       103
       -
        

     

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

     

       105
       105
       -
       index cea0c1df0a14..eedcd9450312 100644

     

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

     

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

     

       108
       108
       -
       @@ -2,7 +2,7 @@ include(ExtendPath)

     

       109
       109
       -
        include(LLVMDistributionSupport)

     

       110
       110
       -
        include(FindPrefixFromConfig)

     

       111
       111
       -
        

     

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

     

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

     

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

     

       115
       115
       -
        

     

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

     

       117
       117
       -
       @@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       118
       118
       -
          )

     

       119
       119
       -
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       120
       120
       -
        

     

       121
       121
       -
       -extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")

     

       122
       122
       -
       +extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       123
       123
       -
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       124
       124
       -
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

       125
       125
       -
          # FIXME: Should there be other entries here?

     

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

     

       127
       127
       -
       index b5c35f706cb7..9261ab797de6 100644

     

       128
       128
       -
       --- a/cmake/modules/LLVMInstallSymlink.cmake

     

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

     

       130
       130
       -
       @@ -6,7 +6,7 @@ include(GNUInstallDirs)

     

       131
       131
       -
        

     

       132
       132
       -
        function(install_symlink name target outdir)

     

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

     

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

     

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

     

       136
       136
       -
        

     

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

     

       138
       138
       -
        

     

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

     

       140
       140
       -
       index 044ec8a4d39d..504d0eac3ade 100644

     

       141
       141
       -
       --- a/docs/CMake.rst

     

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

     

       143
       143
       -
       @@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below.

     

       144
       144
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

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

     

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

     

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

     

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

     

       149
       149
       -
        

     

       150
       150
       -
        **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING

     

       151
       151
       -
          Building the llvm toolchain can use a lot of resources, particularly

     

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

     

       153
       153
       -
        

     

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

     

       155
       155
       -
        

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       164
       164
       -
        

     

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

     

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

     

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

     

       168
       168
       -
       index b46319f24fc8..2feabd1954e4 100644

     

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

     

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

     

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

     

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

     

       173
       173
       -
        # header files into the build area.

     

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

     

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

     

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

     

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

     

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

     

       179
       179
       -
       index abbb8a450da6..70c497be12f5 100644

     

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

     

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

     

       182
       182
       -
       @@ -23,7 +23,10 @@

     

       183
       183
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       184
       184
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       185
       185
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

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

     

       188
       188
       -
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

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

     

       190
       190
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

       191
       191
       -
        #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"

     

       192
       192
       -
        #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@"

     

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

     

       194
       194
       -
       index 8ed88f33ead4..5e7184bab90d 100644

     

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

     

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

     

       197
       197
       -
       @@ -363,12 +363,20 @@ int main(int argc, char **argv) {

     

       198
       198
       -
              ActiveIncludeDir = std::string(Path.str());

     

       199
       199
       -
            }

     

       200
       200
       -
            {

     

       201
       201
       -
       -      SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR);

     

       202
       202
       -
       +      SmallString<256> Path(LLVM_INSTALL_BINDIR);

     

       203
       203
       -
              sys::fs::make_absolute(ActivePrefix, Path);

     

       204
       204
       -
              ActiveBinDir = std::string(Path.str());

     

       205
       205
       -
            }

     

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

     

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

     

       208
       208
       -
       +    {

     

       209
       209
       -
       +      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       210
       210
       -
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       211
       211
       -
       +      ActiveLibDir = std::string(Path.str());

     

       212
       212
       -
       +    }

     

       213
       213
       -
       +    {

     

       214
       214
       -
       +      SmallString<256> Path(LLVM_INSTALL_CMAKEDIR);

     

       215
       215
       -
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       216
       216
       -
       +      ActiveCMakeDir = std::string(Path.str());

     

       217
       217
       -
       +    }

     

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

     

       219
       219
       -
          }

     

       220
       220
       -

-45

pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       --- a/CMakeLists.txt

     

       3
       3
       -
       +++ b/CMakeLists.txt

     

       4
       4
       -
       @@ -24,7 +24,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       5
       5
       -
          set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING

     

       6
       6
       -
            "Suffix of lib installation directory, e.g. 64 => lib64")

     

       7
       7
       -
          # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.

     

       8
       8
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")

     

       9
       9
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       10
       10
       -
        

     

       11
       11
       -
          # Group test settings.

     

       12
       12
       -
          set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING

     

       13
       13
       -
       @@ -35,7 +35,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       14
       14
       -
        else()

     

       15
       15
       -
          set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})

     

       16
       16
       -
          # If building in tree, we honor the same install suffix LLVM uses.

     

       17
       17
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")

     

       18
       18
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       19
       19
       -
        

     

       20
       20
       -
          if (NOT MSVC)

     

       21
       21
       -
            set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)

     

       22
       22
       -
       diff --git a/libomptarget/plugins/amdgpu/CMakeLists.txt b/libomptarget/plugins/amdgpu/CMakeLists.txt

     

       23
       23
       -
       --- a/libomptarget/plugins/amdgpu/CMakeLists.txt

     

       24
       24
       -
       +++ b/libomptarget/plugins/amdgpu/CMakeLists.txt

     

       25
       25
       -
       @@ -74,7 +74,7 @@ add_library(omptarget.rtl.amdgpu SHARED

     

       26
       26
       -
        

     

       27
       27
       -
        # Install plugin under the lib destination folder.

     

       28
       28
       -
        # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug

     

       29
       29
       -
       -install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}")

     

       30
       30
       -
       +install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       31
       31
       -
        set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON)

     

       32
       32
       -
        

     

       33
       33
       -
        if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

     

       34
       34
       -
       diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt

     

       35
       35
       -
       --- a/libomptarget/plugins/ve/CMakeLists.txt

     

       36
       36
       -
       +++ b/libomptarget/plugins/ve/CMakeLists.txt

     

       37
       37
       -
       @@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND})

     

       38
       38
       -
        

     

       39
       39
       -
          # Install plugin under the lib destination folder.

     

       40
       40
       -
          install(TARGETS "omptarget.rtl.${tmachine_libname}"

     

       41
       41
       -
       -    LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX})

     

       42
       42
       -
       +    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX})

     

       43
       43
       -
        

     

       44
       44
       -
          target_link_libraries(

     

       45
       45
       -
            "omptarget.rtl.${tmachine_libname}"

-12

pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch

···

       1
       1
       -
       diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake

     

       2
       2
       -
       --- a/cmake/OpenMPTesting.cmake

     

       3
       3
       -
       +++ b/cmake/OpenMPTesting.cmake

     

       4
       4
       -
       @@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment)

     

       5
       5
       -
          if (${OPENMP_STANDALONE_BUILD})

     

       6
       6
       -
            set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS})

     

       7
       7
       -
            add_custom_target(${target}

     

       8
       8
       -
       -      COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS}

     

       9
       9
       -
       +      COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS}

     

       10
       10
       -
              COMMENT ${comment}

     

       11
       11
       -
              DEPENDS ${ARG_DEPENDS}

     

       12
       12
       -
              USES_TERMINAL

-105

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

···

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

     

       2
       2
       -
       index c27beec313d7..480f13e73c9f 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE)

     

       6
       6
       -
          if (NOT LLVM_CONFIG_FOUND)

     

       7
       7
       -
            # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       8
       8
       -
            # path is removed.

     

       9
       9
       -
       -    set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")

     

       10
       10
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       11
       11
       -
            set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       12
       12
       -
            # N.B. this is just a default value, the CACHE PATHs below can be overriden.

     

       13
       13
       -
            set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       14
       14
       -
            set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

     

       15
       15
       -
            set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

     

       16
       16
       -
       +  else()

     

       17
       17
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       18
       18
       -
          endif()

     

       19
       19
       -
        

     

       20
       20
       -
       -  set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

     

       21
       21
       -
       +  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       22
       22
       -
          set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       23
       23
       -
          set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       24
       24
       -
          set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")

     

       25
       25
       -
       @@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE)

     

       26
       26
       -
            set(LLVM_INCLUDE_TESTS ON)

     

       27
       27
       -
          endif()

     

       28
       28
       -
        

     

       29
       29
       -
       -  include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")

     

       30
       30
       -
       +  include_directories(${LLVM_INCLUDE_DIRS})

     

       31
       31
       -
          link_directories("${LLVM_LIBRARY_DIR}")

     

       32
       32
       -
        

     

       33
       33
       -
          set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )

     

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

     

       35
       35
       -
       index 21ac332e4f5f..b16c314bd1e2 100644

     

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

     

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

     

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

     

       39
       39
       -
                install(TARGETS ${lib}

     

       40
       40
       -
                  COMPONENT ${lib}

     

       41
       41
       -
                  ${export_to_clangtargets}

     

       42
       42
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       43
       43
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       46
       46
       -
                  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       47
       47
       -
        

     

       48
       48
       -
                if (NOT LLVM_ENABLE_IDE)

     

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

     

       50
       50
       -
       index 6e2060991b92..b9bc930d26b8 100644

     

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

     

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

     

       53
       53
       -
       @@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files})

     

       54
       54
       -
        add_header_target("windows-resource-headers" ${windows_only_files})

     

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

     

       56
       56
       -
        

     

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

     

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

     

       59
       59
       -
        

     

       60
       60
       -
        #############################################################

     

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

     

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

     

       63
       63
       -
       index 8d95d0900e8c..ebc70ff7526d 100644

     

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

     

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

     

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

     

       67
       67
       -
                  COMPONENT

     

       68
       68
       -
                    libclang-python-bindings

     

       69
       69
       -
                  DESTINATION

     

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

     

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

     

       72
       72
       -
        endforeach()

     

       73
       73
       -
        if(NOT LLVM_ENABLE_IDE)

     

       74
       74
       -
          add_custom_target(libclang-python-bindings)

     

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

     

       76
       76
       -
       index 061dc7ef4dd9..adc54b2edc32 100644

     

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

     

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

     

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

     

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

     

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

     

       82
       82
       -
          install(PROGRAMS lib/libscanbuild/${lib}

     

       83
       83
       -
       -          DESTINATION lib/libscanbuild

     

       84
       84
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       85
       85
       -
                  COMPONENT scan-build-py)

     

       86
       86
       -
        endforeach()

     

       87
       87
       -
        

     

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

     

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

     

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

     

       91
       91
       -
          install(PROGRAMS lib/libscanbuild/resources/${resource}

     

       92
       92
       -
       -          DESTINATION lib/libscanbuild/resources

     

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

     

       94
       94
       -
                  COMPONENT scan-build-py)

     

       95
       95
       -
        endforeach()

     

       96
       96
       -
        

     

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

     

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

     

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

     

       100
       100
       -
          install(PROGRAMS lib/libear/${lib}

     

       101
       101
       -
       -          DESTINATION lib/libear

     

       102
       102
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       103
       103
       -
                  COMPONENT scan-build-py)

     

       104
       104
       -
        endforeach()

     

       105
       105
       -

-29

pkgs/development/compilers/llvm/15/clang/purity.patch

···

       1
       1
       -
       From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Thu, 18 May 2017 11:56:12 -0500

     

       4
       4
       -
       Subject: [PATCH] "purity" patch for 5.0

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/Driver/ToolChains/Gnu.cpp | 7 -------

     

       8
       8
       -
        1 file changed, 7 deletions(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

     

       11
       11
       -
       index fe3c0191bb..c6a482bece 100644

     

       12
       12
       -
       --- a/lib/Driver/ToolChains/Gnu.cpp

     

       13
       13
       -
       +++ b/lib/Driver/ToolChains/Gnu.cpp

     

       14
       14
       -
       @@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

     

       15
       15
       -
          } else {

     

       16
       16
       -
            if (Args.hasArg(options::OPT_rdynamic))

     

       17
       17
       -
              CmdArgs.push_back("-export-dynamic");

     

       18
       18
       -
       

     

       19
       19
       -
       -    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&

     

       20
       20
       -
       -        !Args.hasArg(options::OPT_r)) {

     

       21
       21
       -
       -      CmdArgs.push_back("-dynamic-linker");

     

       22
       22
       -
       -      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

     

       23
       23
       -
       -                                           ToolChain.getDynamicLinker(Args)));

     

       24
       24
       -
       -    }

     

       25
       25
       -
          }

     

       26
       26
       -
        

     

       27
       27
       -
          CmdArgs.push_back("-o");

     

       28
       28
       -
       -- 

     

       29
       29
       -
       2.11.0

pkgs/development/compilers/llvm/15/compiler-rt/X86-support-extension.patch pkgs/development/compilers/llvm/18/compiler-rt/X86-support-extension.patch

pkgs/development/compilers/llvm/15/compiler-rt/armv6-scudo-libatomic.patch pkgs/development/compilers/llvm/18/compiler-rt/armv6-scudo-libatomic.patch

-20

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

···

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

     

       2
       2
       -
       index 8a6219568b3f..30ee68a47ccf 100644

     

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

     

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

     

       5
       5
       -
       @@ -100,13 +100,13 @@ endif()

     

       6
       6
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       7
       7
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

       8
       8
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib)

     

       9
       9
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)

     

       10
       10
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")

     

       11
       11
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       13
       13
       -
        else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       14
       14
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

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

     

       16
       16
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")

     

       17
       17
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")

     

       18
       18
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       20
       20
       -
        endif()

-22

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

···

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

     

       2
       2
       -
       index 5a06805f05f1..86a50329e6a8 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -117,7 +117,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH

     

       6
       6
       -
        

     

       7
       7
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

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

     

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

     

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

     

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

     

       12
       12
       -
          if(LIBCXX_LIBDIR_SUBDIR)

     

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

     

       14
       14
       -
       @@ -129,7 +129,7 @@ else()

     

       15
       15
       -
          else()

     

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

     

       17
       17
       -
          endif()

     

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

     

       19
       19
       -
       +  set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH

     

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

     

       21
       21
       -
        endif()

     

       22
       22
       -

-46

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

···

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

     

       2
       2
       -
       index dcc649629a4b..58dca54642e4 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE)

     

       6
       6
       -
          if (NOT LLVM_CONFIG_FOUND)

     

       7
       7
       -
            # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       8
       8
       -
            # path is removed.

     

       9
       9
       -
       -    set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")

     

       10
       10
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       11
       11
       -
            set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       12
       12
       -
            # N.B. this is just a default value, the CACHE PATHs below can be overridden.

     

       13
       13
       -
            set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       14
       14
       -
       +  else()

     

       15
       15
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       16
       16
       -
          endif()

     

       17
       17
       -
        

     

       18
       18
       -
       -  set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")

     

       19
       19
       -
       +  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       20
       20
       -
          set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       21
       21
       -
          set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       22
       22
       -
        

     

       23
       23
       -
       @@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE)

     

       24
       24
       -
        

     

       25
       25
       -
          set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")

     

       26
       26
       -
        

     

       27
       27
       -
       -  include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS})

     

       28
       28
       -
       +  include_directories(${LLVM_INCLUDE_DIRS})

     

       29
       29
       -
          link_directories(${LLVM_LIBRARY_DIRS})

     

       30
       30
       -
        

     

       31
       31
       -
          if(LLVM_INCLUDE_TESTS)

     

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

     

       33
       33
       -
       index d3924f7243d4..42a7cd62281c 100644

     

       34
       34
       -
       --- a/cmake/modules/AddLLD.cmake

     

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

     

       36
       36
       -
       @@ -18,8 +18,8 @@ macro(add_lld_library name)

     

       37
       37
       -
            install(TARGETS ${name}

     

       38
       38
       -
              COMPONENT ${name}

     

       39
       39
       -
              ${export_to_lldtargets}

     

       40
       40
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       41
       41
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       44
       44
       -
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       45
       45
       -
        

     

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

-46

pkgs/development/compilers/llvm/15/lldb/procfs.patch

···

       1
       1
       -
       --- a/source/Plugins/Process/Linux/Procfs.h

     

       2
       2
       -
       +++ b/source/Plugins/Process/Linux/Procfs.h

     

       3
       3
       -
       @@ -10,6 +10,13 @@

     

       4
       4
       -
        // sys/procfs.h on Android/Linux for all supported architectures.

     

       5
       5
       -
        

     

       6
       6
       -
        #include <sys/ptrace.h>

     

       7
       7
       -
       +#include <asm/ptrace.h>

     

       8
       8
       -
       +

     

       9
       9
       -
       +// on i686 preprocessor symbols with these register names are defined as

     

       10
       10
       -
       +// numeric constants; these symbols clash with identifier names used in

     

       11
       11
       -
       +// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h`

     

       12
       12
       -
       +#undef FS

     

       13
       13
       -
       +#undef CS

     

       14
       14
       -
        

     

       15
       15
       -
        #include "lldb/lldb-types.h"

     

       16
       16
       -
        

     

       17
       17
       -
       @@ -17,23 +24,13 @@

     

       18
       18
       -
        

     

       19
       19
       -
        #include <vector>

     

       20
       20
       -
        

     

       21
       21
       -
       -#ifdef __ANDROID__

     

       22
       22
       -
       -#if defined(__arm64__) || defined(__aarch64__)

     

       23
       23
       -
       -typedef unsigned long elf_greg_t;

     

       24
       24
       -
       -typedef elf_greg_t

     

       25
       25
       -
       -    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];

     

       26
       26
       -
       -typedef struct user_fpsimd_state elf_fpregset_t;

     

       27
       27
       -
       -#ifndef NT_FPREGSET

     

       28
       28
       -
       -#define NT_FPREGSET NT_PRFPREG

     

       29
       29
       -
       -#endif // NT_FPREGSET

     

       30
       30
       -
       -#elif defined(__mips__)

     

       31
       31
       -
       -#ifndef NT_FPREGSET

     

       32
       32
       -
       -#define NT_FPREGSET NT_PRFPREG

     

       33
       33
       -
       -#endif // NT_FPREGSET

     

       34
       34
       -
       -#endif

     

       35
       35
       -
       -#else // __ANDROID__

     

       36
       36
       -
       +#if !defined(__GLIBC__) && defined(__powerpc__)

     

       37
       37
       -
       +#define pt_regs musl_pt_regs

     

       38
       38
       -
       +#include <sys/procfs.h>

     

       39
       39
       -
       +#undef pt_regs

     

       40
       40
       -
       +#else

     

       41
       41
       -
        #include <sys/procfs.h>

     

       42
       42
       -
       -#endif // __ANDROID__

     

       43
       43
       -
       +#endif

     

       44
       44
       -
        

     

       45
       45
       -
        namespace lldb_private {

     

       46
       46
       -
        namespace process_linux {

-138

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

···

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

     

       2
       2
       -
       index 45399dc0537e..5d946e9e6583 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")

     

       6
       6
       -
          add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src

     

       7
       7
       -
            ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)

     

       8
       8
       -
          install(TARGETS tf_xla_runtime EXPORT LLVMExports

     

       9
       9
       -
       -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       10
       10
       -
       +    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       11
       11
       -
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)

     

       12
       12
       -
          # Once we add more modules, we should handle this more automatically.

     

       13
       13
       -
          if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)

     

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

     

       15
       15
       -
       index 057431208322..56f0dcb258da 100644

     

       16
       16
       -
       --- a/cmake/modules/AddLLVM.cmake

     

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

     

       18
       18
       -
       @@ -844,8 +844,8 @@ macro(add_llvm_library name)

     

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

     

       20
       20
       -
              install(TARGETS ${name}

     

       21
       21
       -
                      ${export_to_llvmexports}

     

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

     

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

     

       24
       24
       -
       +              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       25
       25
       -
       +              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       26
       26
       -
                      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       27
       27
       -
        

     

       28
       28
       -
              if (NOT LLVM_ENABLE_IDE)

     

       29
       29
       -
       @@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type)

     

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

     

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

     

       32
       32
       -
        

     

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

     

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

     

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

     

       36
       36
       -
            set(output_dir "${CMAKE_INSTALL_BINDIR}")

     

       37
       37
       -
          endif()

     

       38
       38
       -
       @@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name)

     

       39
       39
       -
        

     

       40
       40
       -
          if (APPLE)

     

       41
       41
       -
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

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

     

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

     

       44
       44
       -
          elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)

     

       45
       45
       -
            # $ORIGIN is not interpreted at link time by aix ld.

     

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

     

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

     

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

     

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

     

       50
       50
       -
       +    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       51
       51
       -
          elseif(UNIX)

     

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

     

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

     

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

     

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

     

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

     

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

     

       58
       58
       -
       index 891c9e6d618c..8d963f3b0069 100644

     

       59
       59
       -
       --- a/cmake/modules/AddOCaml.cmake

     

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

     

       61
       61
       -
       @@ -147,9 +147,9 @@ function(add_ocaml_library name)

     

       62
       62
       -
          endforeach()

     

       63
       63
       -
        

     

       64
       64
       -
          if( APPLE )

     

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

     

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

     

       67
       67
       -
          elseif( UNIX )

     

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

     

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

     

       70
       70
       -
          endif()

     

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

     

       72
       72
       -
        

     

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

     

       74
       74
       -
       index d4b0ab959148..26ed981fd09f 100644

     

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

     

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

     

       77
       77
       -
       @@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       78
       78
       -
          )

     

       79
       79
       -
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       80
       80
       -
        

     

       81
       81
       -
       -extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")

     

       82
       82
       -
       +extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       83
       83
       -
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       84
       84
       -
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

       85
       85
       -
          # FIXME: Should there be other entries here?

     

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

     

       87
       87
       -
       index 879b7b231d4c..9c31d14e8950 100644

     

       88
       88
       -
       --- a/docs/CMake.rst

     

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

     

       90
       90
       -
       @@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below.

     

       91
       91
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

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

     

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

     

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

     

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

     

       96
       96
       -
        

     

       97
       97
       -
        **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING

     

       98
       98
       -
          Building the llvm toolchain can use a lot of resources, particularly

     

       99
       99
       -
       @@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``.

     

       100
       100
       -
          The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*.

     

       101
       101
       -
          Defaults to "bin".

     

       102
       102
       -
        

     

       103
       103
       -
       +**CMAKE_INSTALL_LIBDIR**:PATH

     

       104
       104
       -
       +  The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*.

     

       105
       105
       -
       +  Defaults to "lib".

     

       106
       106
       -
       +

     

       107
       107
       -
        **CMAKE_INSTALL_INCLUDEDIR**:PATH

     

       108
       108
       -
          The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*.

     

       109
       109
       -
          Defaults to "include".

     

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

     

       111
       111
       -
       index 370005cd8d7d..7e790bc52111 100644

     

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

     

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

     

       114
       114
       -
       @@ -23,6 +23,7 @@

     

       115
       115
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       116
       116
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       117
       117
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

       119
       119
       -
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       120
       120
       -
        #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       121
       121
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

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

     

       123
       123
       -
       index 2c6c55f89d38..f6d2068a0827 100644

     

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

     

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

     

       126
       126
       -
       @@ -369,7 +369,11 @@ int main(int argc, char **argv) {

     

       127
       127
       -
              sys::fs::make_absolute(ActivePrefix, Path);

     

       128
       128
       -
              ActiveBinDir = std::string(Path.str());

     

       129
       129
       -
            }

     

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

     

       131
       131
       -
       +    {

     

       132
       132
       -
       +      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       133
       133
       -
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       134
       134
       -
       +      ActiveLibDir = std::string(Path.str());

     

       135
       135
       -
       +    }

     

       136
       136
       -
            {

     

       137
       137
       -
              SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);

     

       138
       138
       -
              sys::fs::make_absolute(ActivePrefix, Path);

-26

pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch

···

       1
       1
       -
       diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py

     

       2
       2
       -
       index 0242e0b75af3..d732011306f7 100644

     

       3
       3
       -
       --- a/utils/lit/lit/TestRunner.py

     

       4
       4
       -
       +++ b/utils/lit/lit/TestRunner.py

     

       5
       5
       -
       @@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):

     

       6
       6
       -
                    f.write('@echo off\n')

     

       7
       7
       -
                f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands))

     

       8
       8
       -
            else:

     

       9
       9
       -
       +        # This env var is *purged* when invoking subprocesses so we have to

     

       10
       10
       -
       +        # manually set it from within the bash script in order for the commands

     

       11
       11
       -
       +        # in run lines to see this var:

     

       12
       12
       -
       +        if "DYLD_LIBRARY_PATH" in test.config.environment:

     

       13
       13
       -
       +            f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n')

     

       14
       14
       -
       +

     

       15
       15
       -
                for i, ln in enumerate(commands):

     

       16
       16
       -
                    match = re.match(kPdbgRegex, ln)

     

       17
       17
       -
                    if match:

     

       18
       18
       -
       @@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={},

     

       19
       19
       -
                return processed

     

       20
       20
       -
        

     

       21
       21
       -
            process = processLine if recursion_limit is None else processLineToFixedPoint

     

       22
       22
       -
       -    

     

       23
       23
       -
       +

     

       24
       24
       -
            return [unescapePercents(process(ln)) for ln in script]

     

       25
       25
       -
        

     

       26
       26
       -

-79

pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch

···

       1
       1
       -
       diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py

     

       2
       2
       -
       index 81e8dc04acea..479ff95681e2 100644

     

       3
       3
       -
       --- a/test/Unit/lit.cfg.py

     

       4
       4
       -
       +++ b/test/Unit/lit.cfg.py

     

       5
       5
       -
       @@ -3,6 +3,7 @@

     

       6
       6
       -
        # Configuration file for the 'lit' test runner.

     

       7
       7
       -
        

     

       8
       8
       -
        import os

     

       9
       9
       -
       +import platform

     

       10
       10
       -
        import subprocess

     

       11
       11
       -
        

     

       12
       12
       -
        import lit.formats

     

       13
       13
       -
       @@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):

     

       14
       14
       -
        # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate.

     

       15
       15
       -
        if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ:

     

       16
       16
       -
            config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE']

     

       17
       17
       -
       +

     

       18
       18
       -
       +# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       19
       19
       -
       +#

     

       20
       20
       -
       +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       21
       21
       -
       +def find_shlibpath_var():

     

       22
       22
       -
       +    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       23
       23
       -
       +        yield 'LD_LIBRARY_PATH'

     

       24
       24
       -
       +    elif platform.system() == 'Darwin':

     

       25
       25
       -
       +        yield 'DYLD_LIBRARY_PATH'

     

       26
       26
       -
       +    elif platform.system() == 'Windows':

     

       27
       27
       -
       +        yield 'PATH'

     

       28
       28
       -
       +    elif platform.system() == 'AIX':

     

       29
       29
       -
       +        yield 'LIBPATH'

     

       30
       30
       -
       +

     

       31
       31
       -
       +for shlibpath_var in find_shlibpath_var():

     

       32
       32
       -
       +    shlibpath = os.path.pathsep.join(

     

       33
       33
       -
       +        (config.shlibdir,

     

       34
       34
       -
       +         config.environment.get(shlibpath_var, '')))

     

       35
       35
       -
       +    config.environment[shlibpath_var] = shlibpath

     

       36
       36
       -
       +    break

     

       37
       37
       -
       +else:

     

       38
       38
       -
       +    lit_config.warning("unable to inject shared library path on '{}'"

     

       39
       39
       -
       +                       .format(platform.system()))

     

       40
       40
       -
       diff --git a/test/lit.cfg.py b/test/lit.cfg.py

     

       41
       41
       -
       index 75a38b4c5dad..856fc75c9d74 100644

     

       42
       42
       -
       --- a/test/lit.cfg.py

     

       43
       43
       -
       +++ b/test/lit.cfg.py

     

       44
       44
       -
       @@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)

     

       45
       45
       -
        llvm_config.with_system_environment(

     

       46
       46
       -
            ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])

     

       47
       47
       -
        

     

       48
       48
       -
       +# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       49
       49
       -
       +#

     

       50
       50
       -
       +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       51
       51
       -
       +def find_shlibpath_var():

     

       52
       52
       -
       +    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       53
       53
       -
       +        yield 'LD_LIBRARY_PATH'

     

       54
       54
       -
       +    elif platform.system() == 'Darwin':

     

       55
       55
       -
       +        yield 'DYLD_LIBRARY_PATH'

     

       56
       56
       -
       +    elif platform.system() == 'Windows':

     

       57
       57
       -
       +        yield 'PATH'

     

       58
       58
       -
       +    elif platform.system() == 'AIX':

     

       59
       59
       -
       +        yield 'LIBPATH'

     

       60
       60
       -
       +

     

       61
       61
       -
       +for shlibpath_var in find_shlibpath_var():

     

       62
       62
       -
       +    shlibpath = config.llvm_shlib_dir

     

       63
       63
       -
       +    llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True)

     

       64
       64
       -
       +    break

     

       65
       65
       -
       +else:

     

       66
       66
       -
       +    lit_config.warning("unable to inject shared library path on '{}'"

     

       67
       67
       -
       +                       .format(platform.system()))

     

       68
       68
       -
        

     

       69
       69
       -
        # Set up OCAMLPATH to include newly built OCaml libraries.

     

       70
       70
       -
        top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml')

     

       71
       71
       -
       @@ -318,7 +338,7 @@ def have_cxx_shared_library():

     

       72
       72
       -
        

     

       73
       73
       -
            try:

     

       74
       74
       -
                readobj_cmd = subprocess.Popen(

     

       75
       75
       -
       -            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE)

     

       76
       76
       -
       +            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment)

     

       77
       77
       -
            except OSError:

     

       78
       78
       -
                print('could not exec llvm-readobj')

     

       79
       79
       -
                return False

pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch pkgs/development/compilers/llvm/18/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch

-18

pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch

···

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

     

       2
       2
       -
       index ce66214822a2..6ab7b33c95da 100644

     

       3
       3
       -
       --- a/libomptarget/DeviceRTL/CMakeLists.txt

     

       4
       4
       -
       +++ b/libomptarget/DeviceRTL/CMakeLists.txt

     

       5
       5
       -
       @@ -27,10 +27,10 @@ endif()

     

       6
       6
       -
        if (LLVM_DIR)

     

       7
       7
       -
          # Builds that use pre-installed LLVM have LLVM_DIR set.

     

       8
       8
       -
          # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route

     

       9
       9
       -
       -  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       10
       10
       -
       +  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       11
       11
       -
          find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR}

     

       12
       12
       -
       -    NO_DEFAULT_PATH)

     

       13
       13
       -
       -  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       14
       14
       -
       +    )

     

       15
       15
       -
       +  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       16
       16
       -
          if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL))

     

       17
       17
       -
            libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}")

     

       18
       18
       -
            return()

-22

pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index b6ddbe90516d..311ab1d50e7f 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       6
       6
       -
          set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING

     

       7
       7
       -
            "Suffix of lib installation directory, e.g. 64 => lib64")

     

       8
       8
       -
          # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.

     

       9
       9
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")

     

       10
       10
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       11
       11
       -
        

     

       12
       12
       -
          # Group test settings.

     

       13
       13
       -
          set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING

     

       14
       14
       -
       @@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       15
       15
       -
        else()

     

       16
       16
       -
          set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})

     

       17
       17
       -
          # If building in tree, we honor the same install suffix LLVM uses.

     

       18
       18
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")

     

       19
       19
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       20
       20
       -
        

     

       21
       21
       -
          if (NOT MSVC)

     

       22
       22
       -
            set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)

-109

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

···

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

     

       2
       2
       -
       index 090cfa352078..624b7c9f3400 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -38,12 +38,26 @@ if(CLANG_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwritting

     

       10
       10
       -
       -  set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       11
       11
       -
       -  set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")

     

       12
       12
       -
       -  set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

       13
       13
       -
       -  set(LLVM_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")

     

       14
       14
       -
       -  set(LLVM_LIBRARY_DIR "${LLVM_LIBRARY_DIR}" CACHE PATH "Path to llvm/lib")

     

       15
       15
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       16
       16
       -
       +  # LLVM_CONFIG.

     

       17
       17
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

       18
       18
       -
       +    # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       19
       19
       -
       +    # path is removed.

     

       20
       20
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       21
       21
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       22
       22
       -
       +    # N.B. this is just a default value, the CACHE PATHs below can be overriden.

     

       23
       23
       -
       +    set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       24
       24
       -
       +    set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

     

       25
       25
       -
       +    set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

     

       26
       26
       -
       +  else()

     

       27
       27
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       28
       28
       -
       +  endif()

     

       29
       29
       -
       +

     

       30
       30
       -
       +  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       31
       31
       -
       +  set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       32
       32
       -
       +  set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       33
       33
       -
       +  set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")

     

       34
       34
       -
       +  set(LLVM_LIBRARY_DIR "${LIBRARY_DIR}" CACHE PATH "Path to llvm/lib")

     

       35
       35
       -
        

     

       36
       36
       -
          find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}

     

       37
       37
       -
            NO_DEFAULT_PATH)

     

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

     

       39
       39
       -
       index 75b0080f6715..c895b884cd27 100644

     

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

     

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

     

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

     

       43
       43
       -
                install(TARGETS ${lib}

     

       44
       44
       -
                  COMPONENT ${lib}

     

       45
       45
       -
                  ${export_to_clangtargets}

     

       46
       46
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       47
       47
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       50
       50
       -
                  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       51
       51
       -
        

     

       52
       52
       -
                if (NOT LLVM_ENABLE_IDE)

     

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

     

       54
       54
       -
       index bb9a11eabbef..e2de91c65fbb 100644

     

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

     

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

     

       57
       57
       -
       @@ -437,7 +437,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files})

     

       58
       58
       -
        add_header_target("windows-resource-headers" ${windows_only_files})

     

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

     

       60
       60
       -
        

     

       61
       61
       -
       -set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}/include)

     

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

     

       63
       63
       -
        

     

       64
       64
       -
        #############################################################

     

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

     

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

     

       67
       67
       -
       index 4f23065a2472..6a0f55991e24 100644

     

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

     

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

     

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

     

       71
       71
       -
                  COMPONENT

     

       72
       72
       -
                    libclang-python-bindings

     

       73
       73
       -
                  DESTINATION

     

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

     

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

     

       76
       76
       -
        endforeach()

     

       77
       77
       -
        if(NOT LLVM_ENABLE_IDE)

     

       78
       78
       -
          add_custom_target(libclang-python-bindings)

     

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

     

       80
       80
       -
       index 3aca22c0b0a8..3115353e3fe3 100644

     

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

     

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

     

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

     

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

     

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

     

       86
       86
       -
          install(FILES lib/libscanbuild/${lib}

     

       87
       87
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

     

       88
       88
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       89
       89
       -
                  COMPONENT scan-build-py)

     

       90
       90
       -
        endforeach()

     

       91
       91
       -
        

     

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

     

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

     

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

     

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

     

       96
       96
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

     

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

     

       98
       98
       -
                  COMPONENT scan-build-py)

     

       99
       99
       -
        endforeach()

     

       100
       100
       -
        

     

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

     

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

     

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

     

       104
       104
       -
          install(FILES lib/libear/${lib}

     

       105
       105
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

     

       106
       106
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       107
       107
       -
                  COMPONENT scan-build-py)

     

       108
       108
       -
        endforeach()

     

       109
       109
       -

-11

pkgs/development/compilers/llvm/16/compiler-rt/asan-offset.patch

···

       1
       1
       -
       --- a/lib/asan/CMakeLists.txt        2022-06-22 16:46:24.000000000 +0000

     

       2
       2
       -
       +++ b/lib/asan/CMakeLists.txt

     

       3
       3
       -
       @@ -46,7 +46,7 @@ set(ASAN_STATIC_SOURCES

     

       4
       4
       -
          asan_rtl_static.cpp

     

       5
       5
       -
          )

     

       6
       6
       -
        

     

       7
       7
       -
       -if (NOT WIN32 AND NOT APPLE)

     

       8
       8
       -
       +if (LINUX)

     

       9
       9
       -
          list(APPEND ASAN_STATIC_SOURCES

     

       10
       10
       -
            asan_rtl_x86_64.S

     

       11
       11
       -
          )

-21

pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch

···

       1
       1
       -
       --- a/lib/builtins/fp_lib.h	1969-12-31 16:00:01.000000000 -0800

     

       2
       2
       -
       +++ b/lib/builtins/fp_lib.h	2023-12-21 23:39:36.066927293 -0800

     

       3
       3
       -
       @@ -26,18 +26,6 @@

     

       4
       4
       -
        #include <stdbool.h>

     

       5
       5
       -
        #include <stdint.h>

     

       6
       6
       -
        

     

       7
       7
       -
       -// x86_64 FreeBSD prior v9.3 define fixed-width types incorrectly in

     

       8
       8
       -
       -// 32-bit mode.

     

       9
       9
       -
       -#if defined(__FreeBSD__) && defined(__i386__)

     

       10
       10
       -
       -#include <sys/param.h>

     

       11
       11
       -
       -#if __FreeBSD_version < 903000 // v9.3

     

       12
       12
       -
       -#define uint64_t unsigned long long

     

       13
       13
       -
       -#define int64_t long long

     

       14
       14
       -
       -#undef UINT64_C

     

       15
       15
       -
       -#define UINT64_C(c) (c##ULL)

     

       16
       16
       -
       -#endif

     

       17
       17
       -
       -#endif

     

       18
       18
       -
       -

     

       19
       19
       -
        #if defined SINGLE_PRECISION

     

       20
       20
       -
        

     

       21
       21
       -
        typedef uint16_t half_rep_t;

pkgs/development/compilers/llvm/16/compiler-rt/normalize-var.patch pkgs/development/compilers/llvm/18/compiler-rt/normalize-var.patch

pkgs/development/compilers/llvm/16/libclc/gnu-install-dirs.patch pkgs/development/compilers/llvm/18/libclc/gnu-install-dirs.patch

-190

pkgs/development/compilers/llvm/16/lld/add-table-base.patch

···

       1
       1
       -
       From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Sam Clegg <sbc@chromium.org>

     

       3
       3
       -
       Date: Fri, 25 Aug 2023 13:56:16 -0700

     

       4
       4
       -
       Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting

     

       5
       5
       -
       

     

       6
       6
       -
       This is similar to `--global-base` but determines where to place the

     

       7
       7
       -
       table segments rather than that data segments.

     

       8
       8
       -
       

     

       9
       9
       -
       See https://github.com/emscripten-core/emscripten/issues/20097

     

       10
       10
       -
       

     

       11
       11
       -
       Differential Revision: https://reviews.llvm.org/D158892

     

       12
       12
       -
       ---

     

       13
       13
       -
        test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++

     

       14
       14
       -
        wasm/Driver.cpp        | 19 ++++++++--

     

       15
       15
       -
        wasm/Options.td        |  5 ++-

     

       16
       16
       -
        wasm/Writer.cpp        |  8 -----

     

       17
       17
       -
        4 files changed, 93 insertions(+), 11 deletions(-)

     

       18
       18
       -
        create mode 100644 test/wasm/table-base.s

     

       19
       19
       -
       

     

       20
       20
       -
       diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s

     

       21
       21
       -
       new file mode 100644

     

       22
       22
       -
       index 000000000000000..56fff414fd31d96

     

       23
       23
       -
       --- /dev/null

     

       24
       24
       -
       +++ b/test/wasm/table-base.s

     

       25
       25
       -
       @@ -0,0 +1,72 @@

     

       26
       26
       -
       +# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o

     

       27
       27
       -
       +

     

       28
       28
       -
       +# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o

     

       29
       29
       -
       +# RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-DEFAULT

     

       30
       30
       -
       +

     

       31
       31
       -
       +# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o

     

       32
       32
       -
       +# RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-100

     

       33
       33
       -
       +

     

       34
       34
       -
       +.globl _start

     

       35
       35
       -
       +_start:

     

       36
       36
       -
       +  .functype _start () -> ()

     

       37
       37
       -
       +  i32.const _start

     

       38
       38
       -
       +  drop

     

       39
       39
       -
       +  end_function

     

       40
       40
       -
       +

     

       41
       41
       -
       +# CHECK-DEFAULT:       - Type:            TABLE

     

       42
       42
       -
       +# CHECK-DEFAULT-NEXT:    Tables:

     

       43
       43
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           0

     

       44
       44
       -
       +# CHECK-DEFAULT-NEXT:        ElemType:        FUNCREF

     

       45
       45
       -
       +# CHECK-DEFAULT-NEXT:        Limits:

     

       46
       46
       -
       +# CHECK-DEFAULT-NEXT:          Flags:           [ HAS_MAX ]

     

       47
       47
       -
       +# CHECK-DEFAULT-NEXT:          Minimum:         0x2

     

       48
       48
       -
       +# CHECK-DEFAULT-NEXT:          Maximum:         0x2

     

       49
       49
       -
       +

     

       50
       50
       -
       +# CHECK-DEFAULT:       - Type:            GLOBAL

     

       51
       51
       -
       +# CHECK-DEFAULT-NEXT:    Globals:

     

       52
       52
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           0

     

       53
       53
       -
       +# CHECK-DEFAULT-NEXT:        Type:            I32

     

       54
       54
       -
       +# CHECK-DEFAULT-NEXT:        Mutable:         true

     

       55
       55
       -
       +# CHECK-DEFAULT-NEXT:        InitExpr:

     

       56
       56
       -
       +# CHECK-DEFAULT-NEXT:          Opcode:          I32_CONST

     

       57
       57
       -
       +# CHECK-DEFAULT-NEXT:          Value:           66560

     

       58
       58
       -
       +# CHECK-DEFAULT-NEXT:      - Index:           1

     

       59
       59
       -
       +# CHECK-DEFAULT-NEXT:        Type:            I32

     

       60
       60
       -
       +# CHECK-DEFAULT-NEXT:        Mutable:         false

     

       61
       61
       -
       +# CHECK-DEFAULT-NEXT:        InitExpr:

     

       62
       62
       -
       +# CHECK-DEFAULT-NEXT:          Opcode:          I32_CONST

     

       63
       63
       -
       +# CHECK-DEFAULT-NEXT:          Value:           1

     

       64
       64
       -
       +

     

       65
       65
       -
       +# CHECK-DEFAULT:       - Type:            EXPORT

     

       66
       66
       -
       +# CHECK-DEFAULT:           - Name:            __table_base

     

       67
       67
       -
       +# CHECK-DEFAULT-NEXT:        Kind:            GLOBAL

     

       68
       68
       -
       +# CHECK-DEFAULT-NEXT:        Index:           1

     

       69
       69
       -
       +

     

       70
       70
       -
       +# CHECK-100:       - Type:            TABLE

     

       71
       71
       -
       +# CHECK-100-NEXT:    Tables:

     

       72
       72
       -
       +# CHECK-100-NEXT:      - Index:           0

     

       73
       73
       -
       +# CHECK-100-NEXT:        ElemType:        FUNCREF

     

       74
       74
       -
       +# CHECK-100-NEXT:        Limits:

     

       75
       75
       -
       +# CHECK-100-NEXT:          Flags:           [ HAS_MAX ]

     

       76
       76
       -
       +# CHECK-100-NEXT:          Minimum:         0x65

     

       77
       77
       -
       +# CHECK-100-NEXT:          Maximum:         0x65

     

       78
       78
       -
       +

     

       79
       79
       -
       +# CHECK-100:       - Type:            GLOBAL

     

       80
       80
       -
       +# CHECK-100-NEXT:    Globals:

     

       81
       81
       -
       +# CHECK-100-NEXT:      - Index:           0

     

       82
       82
       -
       +# CHECK-100-NEXT:        Type:            I32

     

       83
       83
       -
       +# CHECK-100-NEXT:        Mutable:         true

     

       84
       84
       -
       +# CHECK-100-NEXT:        InitExpr:

     

       85
       85
       -
       +# CHECK-100-NEXT:          Opcode:          I32_CONST

     

       86
       86
       -
       +# CHECK-100-NEXT:          Value:           66560

     

       87
       87
       -
       +# CHECK-100-NEXT:      - Index:           1

     

       88
       88
       -
       +# CHECK-100-NEXT:        Type:            I32

     

       89
       89
       -
       +# CHECK-100-NEXT:        Mutable:         false

     

       90
       90
       -
       +# CHECK-100-NEXT:        InitExpr:

     

       91
       91
       -
       +# CHECK-100-NEXT:          Opcode:          I32_CONST

     

       92
       92
       -
       +# CHECK-100-NEXT:          Value:           100

     

       93
       93
       -
       +

     

       94
       94
       -
       +# CHECK-100:       - Type:            EXPORT

     

       95
       95
       -
       +# CHECK-100:           - Name:            __table_base

     

       96
       96
       -
       +# CHECK-100-NEXT:        Kind:            GLOBAL

     

       97
       97
       -
       +# CHECK-100-NEXT:        Index:           1

     

       98
       98
       -
       diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp

     

       99
       99
       -
       index 84304881f5ca34e..c2f5f0185781f36 100644

     

       100
       100
       -
       --- a/wasm/Driver.cpp

     

       101
       101
       -
       +++ b/wasm/Driver.cpp

     

       102
       102
       -
       @@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) {

     

       103
       103
       -
        

     

       104
       104
       -
          config->initialMemory = args::getInteger(args, OPT_initial_memory, 0);

     

       105
       105
       -
          config->globalBase = args::getInteger(args, OPT_global_base, 0);

     

       106
       106
       -
       +  config->tableBase = args::getInteger(args, OPT_table_base, 0);

     

       107
       107
       -
          config->maxMemory = args::getInteger(args, OPT_max_memory, 0);

     

       108
       108
       -
          config->zStackSize =

     

       109
       109
       -
              args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize);

     

       110
       110
       -
       @@ -573,6 +574,17 @@ static void setConfigs() {

     

       111
       111
       -
            if (config->exportTable)

     

       112
       112
       -
              error("-shared/-pie is incompatible with --export-table");

     

       113
       113
       -
            config->importTable = true;

     

       114
       114
       -
       +  } else {

     

       115
       115
       -
       +    // Default table base.  Defaults to 1, reserving 0 for the NULL function

     

       116
       116
       -
       +    // pointer.

     

       117
       117
       -
       +    if (!config->tableBase)

     

       118
       118
       -
       +      config->tableBase = 1;

     

       119
       119
       -
       +    // The default offset for static/global data, for when --global-base is

     

       120
       120
       -
       +    // not specified on the command line.  The precise value of 1024 is

     

       121
       121
       -
       +    // somewhat arbitrary, and pre-dates wasm-ld (Its the value that

     

       122
       122
       -
       +    // emscripten used prior to wasm-ld).

     

       123
       123
       -
       +    if (!config->globalBase && !config->relocatable && !config->stackFirst)

     

       124
       124
       -
       +      config->globalBase = 1024;

     

       125
       125
       -
          }

     

       126
       126
       -
        

     

       127
       127
       -
          if (config->relocatable) {

     

       128
       128
       -
       @@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) {

     

       129
       129
       -
            warn("-Bsymbolic is only meaningful when combined with -shared");

     

       130
       130
       -
          }

     

       131
       131
       -
        

     

       132
       132
       -
       -  if (config->globalBase && config->isPic) {

     

       133
       133
       -
       -    error("--global-base may not be used with -shared/-pie");

     

       134
       134
       -
       +  if (config->isPic) {

     

       135
       135
       -
       +    if (config->globalBase)

     

       136
       136
       -
       +      error("--global-base may not be used with -shared/-pie");

     

       137
       137
       -
       +    if (config->tableBase)

     

       138
       138
       -
       +      error("--table-base may not be used with -shared/-pie");

     

       139
       139
       -
          }

     

       140
       140
       -
        }

     

       141
       141
       -
        

     

       142
       142
       -
       diff --git a/wasm/Options.td b/wasm/Options.td

     

       143
       143
       -
       index 50417d2928e0a34..bb764396bf4df14 100644

     

       144
       144
       -
       --- a/wasm/Options.td

     

       145
       145
       -
       +++ b/wasm/Options.td

     

       146
       146
       -
       @@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">,

     

       147
       147
       -
          HelpText<"Remove maximum size from function table, allowing table to grow">;

     

       148
       148
       -
        

     

       149
       149
       -
        def global_base: JJ<"global-base=">,

     

       150
       150
       -
       -  HelpText<"Where to start to place global data">;

     

       151
       151
       -
       +  HelpText<"Memory offset at which to place global data (Defaults to 1024)">;

     

       152
       152
       -
        

     

       153
       153
       -
        def import_memory: FF<"import-memory">,

     

       154
       154
       -
          HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">;

     

       155
       155
       -
       @@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">,

     

       156
       156
       -
        def stack_first: FF<"stack-first">,

     

       157
       157
       -
          HelpText<"Place stack at start of linear memory rather than after data">;

     

       158
       158
       -
        

     

       159
       159
       -
       +def table_base: JJ<"table-base=">,

     

       160
       160
       -
       +  HelpText<"Table offset at which to place address taken functions (Defaults to 1)">;

     

       161
       161
       -
       +

     

       162
       162
       -
        defm whole_archive: B<"whole-archive",

     

       163
       163
       -
            "Force load of all members in a static library",

     

       164
       164
       -
            "Do not force load of all members in a static library (default)">;

     

       165
       165
       -
       diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp

     

       166
       166
       -
       index f25d358dc5bae6f..0576bf2907e49c4 100644

     

       167
       167
       -
       --- a/wasm/Writer.cpp

     

       168
       168
       -
       +++ b/wasm/Writer.cpp

     

       169
       169
       -
       @@ -358,13 +358,6 @@ void Writer::layoutMemory() {

     

       170
       170
       -
              memoryPtr = config->globalBase;

     

       171
       171
       -
            }

     

       172
       172
       -
          } else {

     

       173
       173
       -
       -    if (!config->globalBase && !config->relocatable && !config->isPic) {

     

       174
       174
       -
       -      // The default offset for static/global data, for when --global-base is

     

       175
       175
       -
       -      // not specified on the command line.  The precise value of 1024 is

     

       176
       176
       -
       -      // somewhat arbitrary, and pre-dates wasm-ld (Its the value that

     

       177
       177
       -
       -      // emscripten used prior to wasm-ld).

     

       178
       178
       -
       -      config->globalBase = 1024;

     

       179
       179
       -
       -    }

     

       180
       180
       -
            memoryPtr = config->globalBase;

     

       181
       181
       -
          }

     

       182
       182
       -
        

     

       183
       183
       -
       @@ -1685,7 +1678,6 @@ void Writer::run() {

     

       184
       184
       -
          // For PIC code the table base is assigned dynamically by the loader.

     

       185
       185
       -
          // For non-PIC, we start at 1 so that accessing table index 0 always traps.

     

       186
       186
       -
          if (!config->isPic) {

     

       187
       187
       -
       -    config->tableBase = 1;

     

       188
       188
       -
            if (WasmSym::definedTableBase)

     

       189
       189
       -
              WasmSym::definedTableBase->setVA(config->tableBase);

     

       190
       190
       -
            if (WasmSym::definedTableBase32)

-46

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

···

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

     

       2
       2
       -
       index 3d6225646fe6..9b5d0b15af13 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwriting

     

       10
       10
       -
       -  set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       11
       11
       -
       -  set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")

     

       12
       12
       -
       -  set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

       13
       13
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       14
       14
       -
       +  # LLVM_CONFIG.

     

       15
       15
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

       16
       16
       -
       +    # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       17
       17
       -
       +    # path is removed.

     

       18
       18
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       19
       19
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       20
       20
       -
       +    # N.B. this is just a default value, the CACHE PATHs below can be overridden.

     

       21
       21
       -
       +    set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       22
       22
       -
       +  else()

     

       23
       23
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       24
       24
       -
       +  endif()

     

       25
       25
       -
       +

     

       26
       26
       -
       +  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       27
       27
       -
       +  set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       28
       28
       -
       +  set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       29
       29
       -
        

     

       30
       30
       -
          find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}

     

       31
       31
       -
            NO_DEFAULT_PATH)

     

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

     

       33
       33
       -
       index d3924f7243d4..42a7cd62281c 100644

     

       34
       34
       -
       --- a/cmake/modules/AddLLD.cmake

     

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

     

       36
       36
       -
       @@ -18,8 +18,8 @@ macro(add_lld_library name)

     

       37
       37
       -
            install(TARGETS ${name}

     

       38
       38
       -
              COMPONENT ${name}

     

       39
       39
       -
              ${export_to_lldtargets}

     

       40
       40
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       41
       41
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       44
       44
       -
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       45
       45
       -
        

     

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

-14

pkgs/development/compilers/llvm/16/lldb/resource-dir.patch

···

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

     

       2
       2
       -
       index ec06ba285f27..286162f098fb 100644

     

       3
       3
       -
       --- a/cmake/modules/LLDBConfig.cmake

     

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

     

       5
       5
       -
       @@ -290,7 +290,8 @@ if (NOT TARGET clang-resource-headers)

     

       6
       6
       -
          # could be and pick the first that exists.

     

       7
       7
       -
          foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}"

     

       8
       8
       -
                            "${LLVM_BUILD_LIBRARY_DIR}"

     

       9
       9
       -
       -                    "${LLVM_LIBRARY_DIR}")

     

       10
       10
       -
       +                    "${LLVM_LIBRARY_DIR}"

     

       11
       11
       -
       +                    "@clangLibDir@")

     

       12
       12
       -
            # Build the resource directory path by appending 'clang/<version number>'.

     

       13
       13
       -
            set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}")

     

       14
       14
       -
            if (IS_DIRECTORY "${CANDIDATE_RESOURCE_DIR}")

-161

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

···

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

     

       2
       2
       -
       index 7e25e0407db2..72f031a82b75 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -995,7 +995,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")

     

       6
       6
       -
          add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src

     

       7
       7
       -
            ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)

     

       8
       8
       -
          install(TARGETS tf_xla_runtime EXPORT LLVMExports

     

       9
       9
       -
       -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       10
       10
       -
       +    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       11
       11
       -
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)

     

       12
       12
       -
          # Once we add more modules, we should handle this more automatically.

     

       13
       13
       -
          if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)

     

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

     

       15
       15
       -
       index 93e6d67551de..8d367457af5a 100644

     

       16
       16
       -
       --- a/cmake/modules/AddLLVM.cmake

     

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

     

       18
       18
       -
       @@ -874,8 +874,8 @@ macro(add_llvm_library name)

     

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

     

       20
       20
       -
              install(TARGETS ${name}

     

       21
       21
       -
                      ${export_to_llvmexports}

     

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

     

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

     

       24
       24
       -
       +              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       25
       25
       -
       +              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       26
       26
       -
                      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       27
       27
       -
        

     

       28
       28
       -
              if (NOT LLVM_ENABLE_IDE)

     

       29
       29
       -
       @@ -2043,7 +2043,7 @@ function(llvm_install_library_symlink name dest type)

     

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

     

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

     

       32
       32
       -
        

     

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

     

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

     

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

     

       36
       36
       -
            set(output_dir "${CMAKE_INSTALL_BINDIR}")

     

       37
       37
       -
          endif()

     

       38
       38
       -
       @@ -2312,16 +2312,37 @@ function(llvm_setup_rpath name)

     

       39
       39
       -
        

     

       40
       40
       -
          if (APPLE)

     

       41
       41
       -
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

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

     

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

     

       44
       44
       -
          elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)

     

       45
       45
       -
            # $ORIGIN is not interpreted at link time by aix ld.

     

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

     

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

     

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

     

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

     

       50
       50
       -
       +    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       51
       51
       -
          elseif(UNIX)

     

       52
       52
       -
       -    set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

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

     

       54
       54
       -
       +    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back

     

       55
       55
       -
       +    # to `_install_rpath` here.

     

       56
       56
       -
       +    #

     

       57
       57
       -
       +    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.

     

       58
       58
       -
       +    # clang); instead LLVM is its own package and thus lands at its own nix

     

       59
       59
       -
       +    # store path. This makes it so that the default relative rpath (`../lib/`)

     

       60
       60
       -
       +    # does not point at the LLVM shared objects.

     

       61
       61
       -
       +    #

     

       62
       62
       -
       +    # More discussion here:

     

       63
       63
       -
       +    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329

     

       64
       64
       -
       +    #   - https://reviews.llvm.org/D146918 (16.0.5+)

     

       65
       65
       -
       +    #

     

       66
       66
       -
       +    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is

     

       67
       67
       -
       +    # no potential that this will result in us pulling in the "wrong" LLVM.

     

       68
       68
       -
       +    # Adding this to the build rpath means we aren't forced to use

     

       69
       69
       -
       +    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build

     

       70
       70
       -
       +    # dir, pre-install, will have the right rpath for LLVM).

     

       71
       71
       -
       +    #

     

       72
       72
       -
       +    # As noted in the differential above, an alternative solution is to have

     

       73
       73
       -
       +    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set

     

       74
       74
       -
       +    # `CMAKE_INSTALL_RPATH`.

     

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

     

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

     

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

     

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

     

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

     

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

     

       81
       81
       -
       index 891c9e6d618c..8d963f3b0069 100644

     

       82
       82
       -
       --- a/cmake/modules/AddOCaml.cmake

     

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

     

       84
       84
       -
       @@ -147,9 +147,9 @@ function(add_ocaml_library name)

     

       85
       85
       -
          endforeach()

     

       86
       86
       -
        

     

       87
       87
       -
          if( APPLE )

     

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

     

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

     

       90
       90
       -
          elseif( UNIX )

     

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

     

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

     

       93
       93
       -
          endif()

     

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

     

       95
       95
       -
        

     

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

     

       97
       97
       -
       index d99af79aa38e..21e794224b99 100644

     

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

     

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

     

       100
       100
       -
       @@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       101
       101
       -
          )

     

       102
       102
       -
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       103
       103
       -
        

     

       104
       104
       -
       -extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")

     

       105
       105
       -
       +extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       106
       106
       -
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       107
       107
       -
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

       108
       108
       -
          # FIXME: Should there be other entries here?

     

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

     

       110
       110
       -
       index 7926de258ec8..5ae01adc3905 100644

     

       111
       111
       -
       --- a/docs/CMake.rst

     

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

     

       113
       113
       -
       @@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below.

     

       114
       114
       -
        **LLVM_LIBDIR_SUFFIX**:STRING

     

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

     

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

     

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

     

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

     

       119
       119
       -
        

     

       120
       120
       -
        **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING

     

       121
       121
       -
          Building the llvm toolchain can use a lot of resources, particularly

     

       122
       122
       -
       @@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``.

     

       123
       123
       -
          The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*.

     

       124
       124
       -
          Defaults to "bin".

     

       125
       125
       -
        

     

       126
       126
       -
       +**CMAKE_INSTALL_LIBDIR**:PATH

     

       127
       127
       -
       +  The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*.

     

       128
       128
       -
       +  Defaults to "lib".

     

       129
       129
       -
       +

     

       130
       130
       -
        **CMAKE_INSTALL_INCLUDEDIR**:PATH

     

       131
       131
       -
          The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*.

     

       132
       132
       -
          Defaults to "include".

     

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

     

       134
       134
       -
       index 370005cd8d7d..7e790bc52111 100644

     

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

     

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

     

       137
       137
       -
       @@ -23,6 +23,7 @@

     

       138
       138
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       139
       139
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       140
       140
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

       142
       142
       -
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       143
       143
       -
        #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       144
       144
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

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

     

       146
       146
       -
       index b1d795a0a349..de6cb1514f05 100644

     

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

     

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

     

       149
       149
       -
       @@ -366,7 +366,11 @@ int main(int argc, char **argv) {

     

       150
       150
       -
              sys::fs::make_absolute(ActivePrefix, Path);

     

       151
       151
       -
              ActiveBinDir = std::string(Path.str());

     

       152
       152
       -
            }

     

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

     

       154
       154
       -
       +    {

     

       155
       155
       -
       +      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       156
       156
       -
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       157
       157
       -
       +      ActiveLibDir = std::string(Path.str());

     

       158
       158
       -
       +    }

     

       159
       159
       -
            {

     

       160
       160
       -
              SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);

     

       161
       161
       -
              sys::fs::make_absolute(ActivePrefix, Path);

-17

pkgs/development/compilers/llvm/16/llvm/lit-shell-script-runner-set-dyld-library-path.patch

···

       1
       1
       -
       diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py

     

       2
       2
       -
       index 0242e0b75af3..d732011306f7 100644

     

       3
       3
       -
       --- a/utils/lit/lit/TestRunner.py

     

       4
       4
       -
       +++ b/utils/lit/lit/TestRunner.py

     

       5
       5
       -
       @@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):

     

       6
       6
       -
                    f.write('@echo off\n')

     

       7
       7
       -
                f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands))

     

       8
       8
       -
            else:

     

       9
       9
       -
       +        # This env var is *purged* when invoking subprocesses so we have to

     

       10
       10
       -
       +        # manually set it from within the bash script in order for the commands

     

       11
       11
       -
       +        # in run lines to see this var:

     

       12
       12
       -
       +        if "DYLD_LIBRARY_PATH" in test.config.environment:

     

       13
       13
       -
       +            f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n')

     

       14
       14
       -
       +

     

       15
       15
       -
                for i, ln in enumerate(commands):

     

       16
       16
       -
                    match = re.match(kPdbgRegex, ln)

     

       17
       17
       -
                    if match:

-79

pkgs/development/compilers/llvm/16/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch

···

       1
       1
       -
       diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py

     

       2
       2
       -
       index 81e8dc04acea..479ff95681e2 100644

     

       3
       3
       -
       --- a/test/Unit/lit.cfg.py

     

       4
       4
       -
       +++ b/test/Unit/lit.cfg.py

     

       5
       5
       -
       @@ -3,6 +3,7 @@

     

       6
       6
       -
        # Configuration file for the 'lit' test runner.

     

       7
       7
       -
        

     

       8
       8
       -
        import os

     

       9
       9
       -
       +import platform

     

       10
       10
       -
        import subprocess

     

       11
       11
       -
        

     

       12
       12
       -
        import lit.formats

     

       13
       13
       -
       @@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):

     

       14
       14
       -
        # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate.

     

       15
       15
       -
        if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ:

     

       16
       16
       -
            config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE']

     

       17
       17
       -
       +

     

       18
       18
       -
       +# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       19
       19
       -
       +#

     

       20
       20
       -
       +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       21
       21
       -
       +def find_shlibpath_var():

     

       22
       22
       -
       +    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       23
       23
       -
       +        yield 'LD_LIBRARY_PATH'

     

       24
       24
       -
       +    elif platform.system() == 'Darwin':

     

       25
       25
       -
       +        yield 'DYLD_LIBRARY_PATH'

     

       26
       26
       -
       +    elif platform.system() == 'Windows':

     

       27
       27
       -
       +        yield 'PATH'

     

       28
       28
       -
       +    elif platform.system() == 'AIX':

     

       29
       29
       -
       +        yield 'LIBPATH'

     

       30
       30
       -
       +

     

       31
       31
       -
       +for shlibpath_var in find_shlibpath_var():

     

       32
       32
       -
       +    shlibpath = os.path.pathsep.join(

     

       33
       33
       -
       +        (config.shlibdir,

     

       34
       34
       -
       +         config.environment.get(shlibpath_var, '')))

     

       35
       35
       -
       +    config.environment[shlibpath_var] = shlibpath

     

       36
       36
       -
       +    break

     

       37
       37
       -
       +else:

     

       38
       38
       -
       +    lit_config.warning("unable to inject shared library path on '{}'"

     

       39
       39
       -
       +                       .format(platform.system()))

     

       40
       40
       -
       diff --git a/test/lit.cfg.py b/test/lit.cfg.py

     

       41
       41
       -
       index 75a38b4c5dad..856fc75c9d74 100644

     

       42
       42
       -
       --- a/test/lit.cfg.py

     

       43
       43
       -
       +++ b/test/lit.cfg.py

     

       44
       44
       -
       @@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)

     

       45
       45
       -
        llvm_config.with_system_environment(

     

       46
       46
       -
            ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])

     

       47
       47
       -
        

     

       48
       48
       -
       +# Add the LLVM dynamic libs to the platform-specific loader search path env var:

     

       49
       49
       -
       +#

     

       50
       50
       -
       +# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify..

     

       51
       51
       -
       +def find_shlibpath_var():

     

       52
       52
       -
       +    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']:

     

       53
       53
       -
       +        yield 'LD_LIBRARY_PATH'

     

       54
       54
       -
       +    elif platform.system() == 'Darwin':

     

       55
       55
       -
       +        yield 'DYLD_LIBRARY_PATH'

     

       56
       56
       -
       +    elif platform.system() == 'Windows':

     

       57
       57
       -
       +        yield 'PATH'

     

       58
       58
       -
       +    elif platform.system() == 'AIX':

     

       59
       59
       -
       +        yield 'LIBPATH'

     

       60
       60
       -
       +

     

       61
       61
       -
       +for shlibpath_var in find_shlibpath_var():

     

       62
       62
       -
       +    shlibpath = config.llvm_shlib_dir

     

       63
       63
       -
       +    llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True)

     

       64
       64
       -
       +    break

     

       65
       65
       -
       +else:

     

       66
       66
       -
       +    lit_config.warning("unable to inject shared library path on '{}'"

     

       67
       67
       -
       +                       .format(platform.system()))

     

       68
       68
       -
        

     

       69
       69
       -
        # Set up OCAMLPATH to include newly built OCaml libraries.

     

       70
       70
       -
        top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml')

     

       71
       71
       -
       @@ -318,7 +338,7 @@ def have_cxx_shared_library():

     

       72
       72
       -
        

     

       73
       73
       -
            try:

     

       74
       74
       -
                readobj_cmd = subprocess.Popen(

     

       75
       75
       -
       -            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE)

     

       76
       76
       -
       +            [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment)

     

       77
       77
       -
            except OSError:

     

       78
       78
       -
                print('could not exec llvm-readobj')

     

       79
       79
       -
                return False

-21

pkgs/development/compilers/llvm/16/openmp/fix-find-tool.patch

···

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

     

       2
       2
       -
       index 49b398c9f765..6f1dd1340010 100644

     

       3
       3
       -
       --- a/libomptarget/DeviceRTL/CMakeLists.txt

     

       4
       4
       -
       +++ b/libomptarget/DeviceRTL/CMakeLists.txt

     

       5
       5
       -
       @@ -27,11 +27,11 @@ endif()

     

       6
       6
       -
        if (LLVM_DIR)

     

       7
       7
       -
          # Builds that use pre-installed LLVM have LLVM_DIR set.

     

       8
       8
       -
          # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route

     

       9
       9
       -
       -  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       10
       10
       -
       -  find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       11
       11
       -
       -  find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       12
       12
       -
       -  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       13
       13
       -
       -  find_program(EXTRACT_TOOL llvm-extract PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH)

     

       14
       14
       -
       +  find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       15
       15
       -
       +  find_program(PACKAGER_TOOL clang-offload-packager PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       16
       16
       -
       +  find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       17
       17
       -
       +  find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       18
       18
       -
       +  find_program(EXTRACT_TOOL llvm-extract PATHS ${LLVM_TOOLS_BINARY_DIR})

     

       19
       19
       -
          if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL) OR (NOT EXTRACT_TOOL) OR (NOT PACKAGER_TOOL))

     

       20
       20
       -
            libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL}, opt: ${OPT_TOOL}, llvm-extract: ${EXTRACT_TOOL}, or clang-offload-packager: ${PACKAGER_TOOL}")

     

       21
       21
       -
            return()

-22

pkgs/development/compilers/llvm/16/openmp/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index b6ddbe90516d..311ab1d50e7f 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       6
       6
       -
          set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING

     

       7
       7
       -
            "Suffix of lib installation directory, e.g. 64 => lib64")

     

       8
       8
       -
          # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.

     

       9
       9
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")

     

       10
       10
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       11
       11
       -
        

     

       12
       12
       -
          # Group test settings.

     

       13
       13
       -
          set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING

     

       14
       14
       -
       @@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       15
       15
       -
        else()

     

       16
       16
       -
          set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})

     

       17
       17
       -
          # If building in tree, we honor the same install suffix LLVM uses.

     

       18
       18
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")

     

       19
       19
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       20
       20
       -
        

     

       21
       21
       -
          if (NOT MSVC)

     

       22
       22
       -
            set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)

pkgs/development/compilers/llvm/16/openmp/run-lit-directly.patch pkgs/development/compilers/llvm/18/openmp/run-lit-directly.patch

-39

pkgs/development/compilers/llvm/17/clang/aarch64-tblgen.patch

···

       1
       1
       -
       diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def

     

       2
       2
       -
       index ef0dad0f2..afd101b00 100644

     

       3
       3
       -
       --- a/include/clang/Basic/TokenKinds.def

     

       4
       4
       -
       +++ b/include/clang/Basic/TokenKinds.def

     

       5
       5
       -
       @@ -753,7 +753,7 @@ KEYWORD(__builtin_sycl_unique_stable_name, KEYSYCL)

     

       6
       6
       -
       

     

       7
       7
       -
        // Keywords defined by Attr.td.

     

       8
       8
       -
        #ifndef KEYWORD_ATTRIBUTE

     

       9
       9
       -
       -#define KEYWORD_ATTRIBUTE(X) KEYWORD(X, KEYALL)

     

       10
       10
       -
       +#define KEYWORD_ATTRIBUTE(X, EMPTY) KEYWORD(EMPTY ## X, KEYALL)

     

       11
       11
       -
        #endif

     

       12
       12
       -
        #include "clang/Basic/AttrTokenKinds.inc"

     

       13
       13
       -
       

     

       14
       14
       -
       diff --git a/include/clang/Basic/TokenKinds.h b/include/clang/Basic/TokenKinds.h

     

       15
       15
       -
       index e4857405b..ff117bd5a 100644

     

       16
       16
       -
       --- a/include/clang/Basic/TokenKinds.h

     

       17
       17
       -
       +++ b/include/clang/Basic/TokenKinds.h

     

       18
       18
       -
       @@ -109,7 +109,7 @@ bool isPragmaAnnotation(TokenKind K);

     

       19
       19
       -
       

     

       20
       20
       -
        inline constexpr bool isRegularKeywordAttribute(TokenKind K) {

     

       21
       21
       -
          return (false

     

       22
       22
       -
       -#define KEYWORD_ATTRIBUTE(X) || (K == tok::kw_##X)

     

       23
       23
       -
       +#define KEYWORD_ATTRIBUTE(X, ...) || (K == tok::kw_##X)

     

       24
       24
       -
        #include "clang/Basic/AttrTokenKinds.inc"

     

       25
       25
       -
          );

     

       26
       26
       -
        }

     

       27
       27
       -
       diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp

     

       28
       28
       -
       index b5813c6ab..79db17501 100644

     

       29
       29
       -
       --- a/utils/TableGen/ClangAttrEmitter.cpp

     

       30
       30
       -
       +++ b/utils/TableGen/ClangAttrEmitter.cpp

     

       31
       31
       -
       @@ -3430,7 +3430,7 @@ void EmitClangAttrTokenKinds(RecordKeeper &Records, raw_ostream &OS) {

     

       32
       32
       -
                             "RegularKeyword attributes with arguments are not "

     

       33
       33
       -
                             "yet supported");

     

       34
       34
       -
                OS << "KEYWORD_ATTRIBUTE("

     

       35
       35
       -
       -           << S.getSpellingRecord().getValueAsString("Name") << ")\n";

     

       36
       36
       -
       +           << S.getSpellingRecord().getValueAsString("Name") << ", )\n";

     

       37
       37
       -
              }

     

       38
       38
       -
          OS << "#undef KEYWORD_ATTRIBUTE\n";

     

       39
       39
       -
        }

-98

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

···

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

     

       2
       2
       -
       index f7936d72e088..a362fa49b534 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -31,7 +31,21 @@ if(CLANG_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwritting

     

       10
       10
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       11
       11
       -
       +  # LLVM_CONFIG.

     

       12
       12
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

       13
       13
       -
       +    # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       14
       14
       -
       +    # path is removed.

     

       15
       15
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       16
       16
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       17
       17
       -
       +    # N.B. this is just a default value, the CACHE PATHs below can be overriden.

     

       18
       18
       -
       +    set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       19
       19
       -
       +    set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")

     

       20
       20
       -
       +    set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")

     

       21
       21
       -
       +  else()

     

       22
       22
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       23
       23
       -
       +  endif()

     

       24
       24
       -
       +

     

       25
       25
       -
          set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       26
       26
       -
          set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")

     

       27
       27
       -
          set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

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

     

       29
       29
       -
       index 75b0080f6715..c895b884cd27 100644

     

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

     

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

     

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

     

       33
       33
       -
                install(TARGETS ${lib}

     

       34
       34
       -
                  COMPONENT ${lib}

     

       35
       35
       -
                  ${export_to_clangtargets}

     

       36
       36
       -
       -          LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       37
       37
       -
       -          ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       40
       40
       -
                  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       41
       41
       -
        

     

       42
       42
       -
                if (NOT LLVM_ENABLE_IDE)

     

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

     

       44
       44
       -
       index f2b0c5cddcbb..52f37fc368ce 100644

     

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

     

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

     

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

     

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

     

       49
       49
       -
        

     

       50
       50
       -
        get_clang_resource_dir(header_install_dir SUBDIR include)

     

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

     

       52
       52
       -
        

     

       53
       53
       -
        #############################################################

     

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

     

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

     

       56
       56
       -
       index 4f23065a2472..6a0f55991e24 100644

     

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

     

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

     

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

     

       60
       60
       -
                  COMPONENT

     

       61
       61
       -
                    libclang-python-bindings

     

       62
       62
       -
                  DESTINATION

     

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

     

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

     

       65
       65
       -
        endforeach()

     

       66
       66
       -
        if(NOT LLVM_ENABLE_IDE)

     

       67
       67
       -
          add_custom_target(libclang-python-bindings)

     

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

     

       69
       69
       -
       index 3aca22c0b0a8..3115353e3fe3 100644

     

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

     

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

     

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

     

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

     

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

     

       75
       75
       -
          install(FILES lib/libscanbuild/${lib}

     

       76
       76
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild

     

       77
       77
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"

     

       78
       78
       -
                  COMPONENT scan-build-py)

     

       79
       79
       -
        endforeach()

     

       80
       80
       -
        

     

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

     

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

     

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

     

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

     

       85
       85
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libscanbuild/resources

     

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

     

       87
       87
       -
                  COMPONENT scan-build-py)

     

       88
       88
       -
        endforeach()

     

       89
       89
       -
        

     

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

     

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

     

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

     

       93
       93
       -
          install(FILES lib/libear/${lib}

     

       94
       94
       -
       -          DESTINATION lib${CLANG_LIBDIR_SUFFIX}/libear

     

       95
       95
       -
       +          DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"

     

       96
       96
       -
                  COMPONENT scan-build-py)

     

       97
       97
       -
        endforeach()

     

       98
       98
       -

-29

pkgs/development/compilers/llvm/17/clang/purity.patch

···

       1
       1
       -
       From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Thu, 18 May 2017 11:56:12 -0500

     

       4
       4
       -
       Subject: [PATCH] "purity" patch for 5.0

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/Driver/ToolChains/Gnu.cpp | 7 -------

     

       8
       8
       -
        1 file changed, 7 deletions(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp

     

       11
       11
       -
       index fe3c0191bb..c6a482bece 100644

     

       12
       12
       -
       --- a/lib/Driver/ToolChains/Gnu.cpp

     

       13
       13
       -
       +++ b/lib/Driver/ToolChains/Gnu.cpp

     

       14
       14
       -
       @@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

     

       15
       15
       -
          } else {

     

       16
       16
       -
            if (Args.hasArg(options::OPT_rdynamic))

     

       17
       17
       -
              CmdArgs.push_back("-export-dynamic");

     

       18
       18
       -
       

     

       19
       19
       -
       -    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&

     

       20
       20
       -
       -        !Args.hasArg(options::OPT_r)) {

     

       21
       21
       -
       -      CmdArgs.push_back("-dynamic-linker");

     

       22
       22
       -
       -      CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +

     

       23
       23
       -
       -                                           ToolChain.getDynamicLinker(Args)));

     

       24
       24
       -
       -    }

     

       25
       25
       -
          }

     

       26
       26
       -
        

     

       27
       27
       -
          CmdArgs.push_back("-o");

     

       28
       28
       -
       -- 

     

       29
       29
       -
       2.11.0

-20

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

···

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

     

       2
       2
       -
       index 8a6219568b3f..30ee68a47ccf 100644

     

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

     

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

     

       5
       5
       -
       @@ -100,13 +100,13 @@ endif()

     

       6
       6
       -
        if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       7
       7
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

       8
       8
       -
            ${COMPILER_RT_OUTPUT_DIR}/lib)

     

       9
       9
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib)

     

       10
       10
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}")

     

       11
       11
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       13
       13
       -
        else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)

     

       14
       14
       -
          set(COMPILER_RT_OUTPUT_LIBRARY_DIR

     

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

     

       16
       16
       -
       -  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}")

     

       17
       17
       -
       +  extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}")

     

       18
       18
       -
          set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH

     

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

     

       20
       20
       -
        endif()

-46

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

···

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

     

       2
       2
       -
       index 3d6225646fe6..9b5d0b15af13 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -33,10 +33,22 @@ if(LLD_BUILT_STANDALONE)

     

       6
       6
       -
          find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}")

     

       7
       7
       -
          list(APPEND CMAKE_MODULE_PATH "${LLVM_DIR}")

     

       8
       8
       -
        

     

       9
       9
       -
       -  # Turn into CACHE PATHs for overwriting

     

       10
       10
       -
       -  set(LLVM_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       11
       11
       -
       -  set(LLVM_BINARY_DIR "${LLVM_BINARY_DIR}" CACHE PATH "Path to LLVM build tree")

     

       12
       12
       -
       -  set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree")

     

       13
       13
       -
       +  # We can't check LLVM_CONFIG here, because find_package(LLVM ...) also sets

     

       14
       14
       -
       +  # LLVM_CONFIG.

     

       15
       15
       -
       +  if (NOT LLVM_CONFIG_FOUND)

     

       16
       16
       -
       +    # Pull values from LLVMConfig.cmake.  We can drop this once the llvm-config

     

       17
       17
       -
       +    # path is removed.

     

       18
       18
       -
       +    set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})

     

       19
       19
       -
       +    set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")

     

       20
       20
       -
       +    # N.B. this is just a default value, the CACHE PATHs below can be overridden.

     

       21
       21
       -
       +    set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")

     

       22
       22
       -
       +  else()

     

       23
       23
       -
       +    set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")

     

       24
       24
       -
       +  endif()

     

       25
       25
       -
       +

     

       26
       26
       -
       +  set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")

     

       27
       27
       -
       +  set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree")

     

       28
       28
       -
       +  set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree")

     

       29
       29
       -
        

     

       30
       30
       -
          find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}

     

       31
       31
       -
            NO_DEFAULT_PATH)

     

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

     

       33
       33
       -
       index d3924f7243d4..42a7cd62281c 100644

     

       34
       34
       -
       --- a/cmake/modules/AddLLD.cmake

     

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

     

       36
       36
       -
       @@ -18,8 +18,8 @@ macro(add_lld_library name)

     

       37
       37
       -
            install(TARGETS ${name}

     

       38
       38
       -
              COMPONENT ${name}

     

       39
       39
       -
              ${export_to_lldtargets}

     

       40
       40
       -
       -      LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

       41
       41
       -
       -      ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

     

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

     

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

     

       44
       44
       -
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

     

       45
       45
       -
        

     

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

-137

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

···

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

     

       2
       2
       -
       index 471817d68286..c51463304159 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -1010,7 +1010,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")

     

       6
       6
       -
          add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src

     

       7
       7
       -
            ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)

     

       8
       8
       -
          install(TARGETS tf_xla_runtime EXPORT LLVMExports

     

       9
       9
       -
       -    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       10
       10
       -
       +    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)

     

       11
       11
       -
          set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)

     

       12
       12
       -
          # Once we add more modules, we should handle this more automatically.

     

       13
       13
       -
          if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)

     

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

     

       15
       15
       -
       index 230620c37027..dd16cab1835e 100644

     

       16
       16
       -
       --- a/cmake/modules/AddLLVM.cmake

     

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

     

       18
       18
       -
       @@ -876,8 +876,8 @@ macro(add_llvm_library name)

     

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

     

       20
       20
       -
              install(TARGETS ${name}

     

       21
       21
       -
                      ${export_to_llvmexports}

     

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

     

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

     

       24
       24
       -
       +              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       25
       25
       -
       +              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name}

     

       26
       26
       -
                      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name})

     

       27
       27
       -
        

     

       28
       28
       -
              if (NOT LLVM_ENABLE_IDE)

     

       29
       29
       -
       @@ -2069,7 +2069,7 @@ function(llvm_install_library_symlink name dest type)

     

       30
       30
       -
            set(LLVM_LINK_OR_COPY copy)

     

       31
       31
       -
          endif()

     

       32
       32
       -
        

     

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

     

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

     

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

     

       36
       36
       -
            set(output_dir "${CMAKE_INSTALL_BINDIR}")

     

       37
       37
       -
          endif()

     

       38
       38
       -
       @@ -2344,16 +2344,37 @@ function(llvm_setup_rpath name)

     

       39
       39
       -
        

     

       40
       40
       -
          if (APPLE)

     

       41
       41
       -
            set(_install_name_dir INSTALL_NAME_DIR "@rpath")

     

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

     

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

     

       44
       44
       -
          elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)

     

       45
       45
       -
            # $ORIGIN is not interpreted at link time by aix ld.

     

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

     

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

     

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

     

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

     

       50
       50
       -
       +    set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       51
       51
       -
          elseif(UNIX)

     

       52
       52
       -
       -    set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

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

     

       54
       54
       -
       +    # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back

     

       55
       55
       -
       +    # to `_install_rpath` here.

     

       56
       56
       -
       +    #

     

       57
       57
       -
       +    # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e.

     

       58
       58
       -
       +    # clang); instead LLVM is its own package and thus lands at its own nix

     

       59
       59
       -
       +    # store path. This makes it so that the default relative rpath (`../lib/`)

     

       60
       60
       -
       +    # does not point at the LLVM shared objects.

     

       61
       61
       -
       +    #

     

       62
       62
       -
       +    # More discussion here:

     

       63
       63
       -
       +    #   - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329

     

       64
       64
       -
       +    #   - https://reviews.llvm.org/D146918 (16.0.5+)

     

       65
       65
       -
       +    #

     

       66
       66
       -
       +    # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is

     

       67
       67
       -
       +    # no potential that this will result in us pulling in the "wrong" LLVM.

     

       68
       68
       -
       +    # Adding this to the build rpath means we aren't forced to use

     

       69
       69
       -
       +    # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build

     

       70
       70
       -
       +    # dir, pre-install, will have the right rpath for LLVM).

     

       71
       71
       -
       +    #

     

       72
       72
       -
       +    # As noted in the differential above, an alternative solution is to have

     

       73
       73
       -
       +    # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set

     

       74
       74
       -
       +    # `CMAKE_INSTALL_RPATH`.

     

       75
       75
       -
       +    set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})

     

       76
       76
       -
       +    set(_install_rpath ${extra_libdir})

     

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

     

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

     

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

     

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

     

       81
       81
       -
       index 891c9e6d618c..8d963f3b0069 100644

     

       82
       82
       -
       --- a/cmake/modules/AddOCaml.cmake

     

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

     

       84
       84
       -
       @@ -147,9 +147,9 @@ function(add_ocaml_library name)

     

       85
       85
       -
          endforeach()

     

       86
       86
       -
        

     

       87
       87
       -
          if( APPLE )

     

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

     

       89
       89
       -
       +    set(ocaml_rpath "${LLVM_LIBRARY_DIR}")

     

       90
       90
       -
          elseif( UNIX )

     

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

     

       92
       92
       -
       +    set(ocaml_rpath "${LLVM_LIBRARY_DIR}")

     

       93
       93
       -
          endif()

     

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

     

       95
       95
       -
        

     

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

     

       97
       97
       -
       index d99af79aa38e..21e794224b99 100644

     

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

     

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

     

       100
       100
       -
       @@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS

     

       101
       101
       -
          )

     

       102
       102
       -
        list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS)

     

       103
       103
       -
        

     

       104
       104
       -
       -extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}")

     

       105
       105
       -
       +extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}")

     

       106
       106
       -
        set(LLVM_CONFIG_LIBRARY_DIRS

     

       107
       107
       -
          "${LLVM_CONFIG_LIBRARY_DIR}"

     

       108
       108
       -
          # FIXME: Should there be other entries here?

     

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

     

       110
       110
       -
       index 370005cd8d7d..7e790bc52111 100644

     

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

     

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

     

       113
       113
       -
       @@ -23,6 +23,7 @@

     

       114
       114
       -
        #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@"

     

       115
       115
       -
        #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"

     

       116
       116
       -
        #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

     

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

     

       118
       118
       -
        #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@"

     

       119
       119
       -
        #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@"

     

       120
       120
       -
        #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"

     

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

     

       122
       122
       -
       index e86eb2b44b10..f63e207e792e 100644

     

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

     

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

     

       125
       125
       -
       @@ -366,7 +366,11 @@ int main(int argc, char **argv) {

     

       126
       126
       -
              sys::fs::make_absolute(ActivePrefix, Path);

     

       127
       127
       -
              ActiveBinDir = std::string(Path.str());

     

       128
       128
       -
            }

     

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

     

       130
       130
       -
       +    {

     

       131
       131
       -
       +      SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX);

     

       132
       132
       -
       +      sys::fs::make_absolute(ActivePrefix, Path);

     

       133
       133
       -
       +      ActiveLibDir = std::string(Path.str());

     

       134
       134
       -
       +    }

     

       135
       135
       -
            {

     

       136
       136
       -
              SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);

     

       137
       137
       -
              sys::fs::make_absolute(ActivePrefix, Path);

pkgs/development/compilers/llvm/17/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch pkgs/development/compilers/llvm/18/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch

pkgs/development/compilers/llvm/17/openmp/fix-find-tool.patch pkgs/development/compilers/llvm/18/openmp/fix-find-tool.patch

-22

pkgs/development/compilers/llvm/17/openmp/gnu-install-dirs.patch

···

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

     

       2
       2
       -
       index b6ddbe90516d..311ab1d50e7f 100644

     

       3
       3
       -
       --- a/CMakeLists.txt

     

       4
       4
       -
       +++ b/CMakeLists.txt

     

       5
       5
       -
       @@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       6
       6
       -
          set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING

     

       7
       7
       -
            "Suffix of lib installation directory, e.g. 64 => lib64")

     

       8
       8
       -
          # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR.

     

       9
       9
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}")

     

       10
       10
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}")

     

       11
       11
       -
        

     

       12
       12
       -
          # Group test settings.

     

       13
       13
       -
          set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING

     

       14
       14
       -
       @@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD)

     

       15
       15
       -
        else()

     

       16
       16
       -
          set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR})

     

       17
       17
       -
          # If building in tree, we honor the same install suffix LLVM uses.

     

       18
       18
       -
       -  set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}")

     

       19
       19
       -
       +  set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")

     

       20
       20
       -
        

     

       21
       21
       -
          if (NOT MSVC)

     

       22
       22
       -
            set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)

+30 -34

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

···

       22
       22
        
             inherit llvm lld;

     

       23
       23
        
           };

     

       24
       24
        
         }

     

       25
       25
       -
         (

     

       26
       26
       -
           ''

     

       27
       27
       -
             mkdir -p $out/bin

     

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

     

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

     

       30
       30
       -
             done

     

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

     

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

     

       33
       33
       -
             done

     

       25
       25
       +
         ''

     

       26
       26
       +
           mkdir -p $out/bin

     

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

     

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

     

       29
       29
       +
           done

     

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

     

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

     

       32
       32
       +
           done

     

       34
       33
        
       

     

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

     

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

     

       36
       35
        
       

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

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

     

       50
       49
        
       

     

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

     

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

     

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

     

       54
       54
       -
             fi

     

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

     

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

     

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

     

       53
       53
       +
           fi

     

       55
       54
        
       

     

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

     

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

     

       57
       56
        
       

     

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

     

       59
       59
       -
           ''

     

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

     

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

     

       62
       62
       -
           ''

     

       63
       63
       -
         )

     

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

     

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

     

       59
       59
       +
         ''

+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

-13

pkgs/development/compilers/llvm/common/clang/clang-11-15-LLVMgold-path.patch

···

       1
       1
       -
       diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp

     

       2
       2
       -
       index 6b6e276b8ce7..7896542a1202 100644

     

       3
       3
       -
       --- a/lib/Driver/ToolChains/CommonArgs.cpp

     

       4
       4
       -
       +++ b/lib/Driver/ToolChains/CommonArgs.cpp

     

       5
       5
       -
       @@ -409,7 +409,7 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,

     

       6
       6
       -
        

     

       7
       7
       -
            SmallString<1024> Plugin;

     

       8
       8
       -
            llvm::sys::path::native(

     

       9
       9
       -
       -        Twine(D.Dir) + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + Suffix,

     

       10
       10
       -
       +        Twine("@libllvmLibdir@" "/LLVMgold") + Suffix,

     

       11
       11
       -
                Plugin);

     

       12
       12
       -
            CmdArgs.push_back(Args.MakeArgString(Plugin));

     

       13
       13
       -
          }

+73 -182

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
       -
           )

     

       79
       55
        
           # Pass the correct path to libllvm

     

       80
       56
        
           ++ [

     

       81
       81
       -
             (replaceVars

     

       82
       82
       -
               (

     

       83
       83
       -
                 if (lib.versionOlder release_version "16") then

     

       84
       84
       -
                   ./clang-11-15-LLVMgold-path.patch

     

       85
       85
       -
                 else

     

       86
       86
       -
                   ./clang-at-least-16-LLVMgold-path.patch

     

       87
       87
       -
               )

     

       88
       88
       -
               {

     

       89
       89
       -
                 libllvmLibdir = "${libllvm.lib}/lib";

     

       90
       90
       -
               }

     

       91
       91
       -
             )

     

       57
       57
       +
             (replaceVars ./clang-at-least-16-LLVMgold-path.patch {

     

       58
       58
       +
               libllvmLibdir = "${libllvm.lib}/lib";

     

       59
       59
       +
             })

     

       92
       60
        
           ]

     

       93
       93
       -
           # Backport version logic from Clang 16. This is needed by the following patch.

     

       94
       94
       -
           ++ lib.optional (lib.versions.major release_version == "15") (fetchpatch {

     

       95
       95
       -
             name = "clang-darwin-Use-consistent-version-define-stringifying-logic.patch";

     

       96
       96
       -
             url = "https://github.com/llvm/llvm-project/commit/60a33ded751c86fff9ac1c4bdd2b341fbe4b0649.patch?full_index=1";

     

       97
       97
       -
             includes = [ "lib/Basic/Targets/OSTargets.cpp" ];

     

       98
       98
       -
             stripLen = 1;

     

       99
       99
       -
             hash = "sha256-YVTSg5eZLz3po2AUczPNXCK26JA3CuTh6Iqp7hAAKIs=";

     

       100
       100
       -
           })

     

       101
       101
       -
           # Backport `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` support from Clang 17.

     

       102
       102
       -
           # This is needed by newer SDKs (14+).

     

       103
       103
       -
           ++

     

       104
       104
       -
             lib.optional

     

       105
       105
       -
               (

     

       106
       106
       -
                 lib.versionAtLeast (lib.versions.major release_version) "15"

     

       107
       107
       -
                 && lib.versionOlder (lib.versions.major release_version) "17"

     

       108
       108
       -
               )

     

       109
       109
       -
               (fetchpatch {

     

       110
       110
       -
                 name = "clang-darwin-An-OS-version-preprocessor-define.patch";

     

       111
       111
       -
                 url = "https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab.patch?full_index=1";

     

       112
       112
       -
                 includes = [ "lib/Basic/Targets/OSTargets.cpp" ];

     

       113
       113
       -
                 stripLen = 1;

     

       114
       114
       -
                 hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";

     

       115
       115
       -
               })

     

       116
       61
        
           # Fixes a bunch of lambda-related crashes

     

       117
       62
        
           # https://github.com/llvm/llvm-project/pull/93206

     

       118
       63
        
           ++ lib.optional (lib.versions.major release_version == "18") (fetchpatch {

     
···

       125
       70
        
             ];

     

       126
       71
        
             stripLen = 1;

     

       127
       72
        
             hash = "sha256-1NKej08R9SPlbDY/5b0OKUsHjX07i9brR84yXiPwi7E=";

     

       128
       128
       -
           })

     

       129
       129
       -
           ++

     

       130
       130
       -
             lib.optional (stdenv.isAarch64 && lib.versions.major release_version == "17")

     

       131
       131
       -
               # Fixes llvm17 tblgen builds on aarch64.

     

       132
       132
       -
               # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680

     

       133
       133
       -
               (getVersionFile "clang/aarch64-tblgen.patch");

     

       73
       73
       +
           });

     

       134
       74
        
       

     

       135
       75
        
           nativeBuildInputs = [

     

       136
       76
        
             cmake

     

       137
       77
        
             python3

     

       78
       78
       +
             ninja

     

       138
       79
        
           ]

     

       139
       139
       -
           ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)

     

       140
       140
       -
           ++ lib.optional (lib.versionAtLeast version "18" && enableManpages) python3.pkgs.myst-parser

     

       141
       141
       -
           ++ lib.optional enableManpages python3.pkgs.sphinx

     

       80
       80
       +
           ++ lib.optionals enableManpages [

     

       81
       81
       +
             python3.pkgs.myst-parser

     

       82
       82
       +
             python3.pkgs.sphinx

     

       83
       83
       +
           ]

     

       142
       84
        
           ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

     

       143
       85
        
       

     

       144
       86
        
           buildInputs = [

     
···

       146
       88
        
             libllvm

     

       147
       89
        
           ];

     

       148
       90
        
       

     

       149
       149
       -
           cmakeFlags =

     

       150
       150
       -
             (lib.optionals (lib.versionAtLeast release_version "15") [

     

       151
       151
       -
               (lib.cmakeFeature "CLANG_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/clang")

     

       152
       152
       -
             ])

     

       153
       153
       -
             ++ [

     

       154
       154
       -
               (lib.cmakeBool "CLANGD_BUILD_XPC" false)

     

       155
       155
       -
               (lib.cmakeBool "LLVM_ENABLE_RTTI" true)

     

       156
       156
       -
               (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       157
       157
       -
               (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")

     

       158
       158
       -
             ]

     

       159
       159
       -
             ++ lib.optionals (lib.versionAtLeast release_version "21") [

     

       160
       160
       -
               (lib.cmakeFeature "CLANG_RESOURCE_DIR" "${placeholder "lib"}/lib/clang/${lib.versions.major release_version}")

     

       161
       161
       -
             ]

     

       162
       162
       -
             ++ lib.optionals (lib.versionAtLeast release_version "17") [

     

       163
       163
       -
               (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)

     

       164
       164
       -
             ]

     

       165
       165
       -
             ++ lib.optionals enableManpages [

     

       166
       166
       -
               (lib.cmakeBool "CLANG_INCLUDE_DOCS" true)

     

       167
       167
       -
               (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)

     

       168
       168
       -
               (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)

     

       169
       169
       -
               (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)

     

       170
       170
       -
               (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)

     

       171
       171
       -
             ]

     

       172
       172
       -
             ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       173
       173
       -
               # Added in LLVM15:

     

       174
       174
       -
               # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb

     

       175
       175
       -
               # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7

     

       176
       176
       -
               (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")

     

       177
       177
       -
             ]

     

       178
       178
       -
             ++ lib.optionals (lib.versionOlder release_version "20") [

     

       179
       179
       -
               # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935

     

       180
       180
       -
               (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")

     

       181
       181
       -
             ]

     

       182
       182
       -
             ++ lib.optional (lib.versionAtLeast release_version "20") (

     

       183
       183
       -
               lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"

     

       184
       184
       -
             )

     

       185
       185
       -
             ++ devExtraCmakeFlags;

     

       91
       91
       +
           cmakeFlags = [

     

       92
       92
       +
             (lib.cmakeFeature "CLANG_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/clang")

     

       93
       93
       +
             (lib.cmakeBool "CLANGD_BUILD_XPC" false)

     

       94
       94
       +
             (lib.cmakeBool "LLVM_ENABLE_RTTI" true)

     

       95
       95
       +
             (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       96
       96
       +
             (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")

     

       97
       97
       +
           ]

     

       98
       98
       +
           ++ lib.optionals (lib.versionAtLeast release_version "21") [

     

       99
       99
       +
             (lib.cmakeFeature "CLANG_RESOURCE_DIR" "${placeholder "lib"}/lib/clang/${lib.versions.major release_version}")

     

       100
       100
       +
           ]

     

       101
       101
       +
           # TODO: Clean up on `staging`.

     

       102
       102
       +
           ++ [

     

       103
       103
       +
             (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)

     

       104
       104
       +
           ]

     

       105
       105
       +
           ++ lib.optionals enableManpages [

     

       106
       106
       +
             (lib.cmakeBool "CLANG_INCLUDE_DOCS" true)

     

       107
       107
       +
             (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)

     

       108
       108
       +
             (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)

     

       109
       109
       +
             (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)

     

       110
       110
       +
             (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)

     

       111
       111
       +
           ]

     

       112
       112
       +
           # TODO: Clean up on `staging`.

     

       113
       113
       +
           ++ [

     

       114
       114
       +
             # Added in LLVM15:

     

       115
       115
       +
             # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb

     

       116
       116
       +
             # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7

     

       117
       117
       +
             (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")

     

       118
       118
       +
           ]

     

       119
       119
       +
           ++ lib.optionals (lib.versionOlder release_version "20") [

     

       120
       120
       +
             # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935

     

       121
       121
       +
             (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")

     

       122
       122
       +
           ]

     

       123
       123
       +
           ++ lib.optional (lib.versionAtLeast release_version "20") (

     

       124
       124
       +
             lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"

     

       125
       125
       +
           )

     

       126
       126
       +
           ++ devExtraCmakeFlags;

     

       186
       127
        
       

     

       187
       128
        
           postPatch = ''

     

       188
       129
        
             # Make sure clang passes the correct location of libLTO to ld64

     
···

       206
       147
        
           postInstall = ''

     

       207
       148
        
             ln -sv $out/bin/clang $out/bin/cpp

     

       208
       149
        
           ''

     

       209
       209
       -
           + (lib.optionalString (lib.versions.major release_version == "17") ''

     

       210
       210
       -
             mkdir -p $lib/lib/clang

     

       211
       211
       -
             mv $lib/lib/17 $lib/lib/clang/17

     

       212
       212
       -
           '')

     

       213
       150
        
           + (lib.optionalString

     

       214
       151
        
             ((lib.versionAtLeast release_version "19") && !(lib.versionAtLeast release_version "21"))

     

       215
       152
        
             ''

     
···

       221
       158
        
             # Move libclang to 'lib' output

     

       222
       159
        
             moveToOutput "lib/libclang.*" "$lib"

     

       223
       160
        
             moveToOutput "lib/libclang-cpp.*" "$lib"

     

       161
       161
       +
             mkdir -p $python/bin $python/share/clang/

     

       224
       162
        
           ''

     

       225
       225
       -
           + (

     

       226
       226
       -
             if lib.versionOlder release_version "15" then

     

       227
       227
       -
               ''

     

       228
       228
       -
                 mkdir -p $python/bin $python/share/{clang,scan-view}

     

       229
       229
       -
               ''

     

       230
       230
       -
             else

     

       231
       231
       -
               ''

     

       232
       232
       -
                 mkdir -p $python/bin $python/share/clang/

     

       233
       233
       -
               ''

     

       234
       234
       -
           )

     

       235
       163
        
           + ''

     

       236
       164
        
             mv $out/bin/{git-clang-format,scan-view} $python/bin

     

       237
       165
        
             if [ -e $out/bin/set-xcode-analyzer ]; then

     

       238
       166
        
               mv $out/bin/set-xcode-analyzer $python/bin

     

       239
       167
        
             fi

     

       240
       168
        
             mv $out/share/clang/*.py $python/share/clang

     

       241
       241
       -
           ''

     

       242
       242
       -
           + (lib.optionalString (lib.versionOlder release_version "15") ''

     

       243
       243
       -
             mv $out/share/scan-view/*.py $python/share/scan-view

     

       244
       244
       -
           '')

     

       245
       245
       -
           + ''

     

       246
       169
        
             rm $out/bin/c-index-test

     

       247
       170
        
             patchShebangs $python/bin

     

       248
       171
        
       

     

       249
       172
        
             mkdir -p $dev/bin

     

       250
       173
        
           ''

     

       251
       174
        
           + (

     

       252
       252
       -
             if lib.versionOlder release_version "15" then

     

       253
       253
       -
               ''

     

       254
       254
       -
                 cp bin/clang-tblgen $dev/bin

     

       255
       255
       -
               ''

     

       256
       256
       -
             else if lib.versionOlder release_version "20" then

     

       175
       175
       +
             if lib.versionOlder release_version "20" then

     

       257
       176
        
               ''

     

       258
       177
        
                 cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin

     

       259
       178
        
               ''

     
···

       264
       183
        
           );

     

       265
       184
        
       

     

       266
       185
        
           env =

     

       267
       267
       -
             lib.optionalAttrs

     

       268
       268
       -
               (

     

       269
       269
       -
                 stdenv.buildPlatform != stdenv.hostPlatform

     

       270
       270
       -
                 && !stdenv.hostPlatform.useLLVM

     

       271
       271
       -
                 && lib.versionAtLeast release_version "15"

     

       272
       272
       -
               )

     

       186
       186
       +
             lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.useLLVM)

     

       273
       187
        
               {

     

       274
       188
        
                 # The following warning is triggered with (at least) gcc >=

     

       275
       189
        
                 # 12, but appears to occur only for cross compiles.

     
···

       282
       196
        
             hardeningUnsupportedFlagsByTargetPlatform =

     

       283
       197
        
               targetPlatform:

     

       284
       198
        
               [ "fortify3" ]

     

       285
       285
       -
               ++ lib.optional (

     

       286
       286
       -
                 (lib.versionOlder release_version "7") || !targetPlatform.isLinux || !targetPlatform.isx86_64

     

       287
       287
       -
               ) "shadowstack"

     

       288
       288
       -
               ++ lib.optional (

     

       289
       289
       -
                 (lib.versionOlder release_version "8") || !targetPlatform.isAarch64 || !targetPlatform.isLinux

     

       290
       290
       -
               ) "pacret"

     

       199
       199
       +
               ++ lib.optional (!targetPlatform.isLinux || !targetPlatform.isx86_64) "shadowstack"

     

       200
       200
       +
               ++ lib.optional (!targetPlatform.isAarch64 || !targetPlatform.isLinux) "pacret"

     

       291
       201
        
               ++ lib.optional (

     

       292
       292
       -
                 (lib.versionOlder release_version "11")

     

       293
       293
       -
                 || (targetPlatform.isAarch64 && (lib.versionOlder release_version "18.1"))

     

       294
       294
       -
                 || (targetPlatform.isFreeBSD && (lib.versionOlder release_version "15"))

     

       295
       295
       -
                 || !(targetPlatform.isLinux || targetPlatform.isFreeBSD)

     

       202
       202
       +
                 !(targetPlatform.isLinux || targetPlatform.isFreeBSD)

     

       296
       203
        
                 || !(

     

       297
       204
        
                   targetPlatform.isx86

     

       298
       205
        
                   || targetPlatform.isPower64

     
···

       300
       207
        
                   || targetPlatform.isAarch64

     

       301
       208
        
                 )

     

       302
       209
        
               ) "stackclashprotection"

     

       303
       303
       -
               ++ lib.optional (

     

       304
       304
       -
                 (lib.versionOlder release_version "15") || !(targetPlatform.isx86_64 || targetPlatform.isAarch64)

     

       305
       305
       -
               ) "zerocallusedregs"

     

       306
       306
       -
               ++ lib.optional (lib.versionOlder release_version "15") "strictflexarrays1"

     

       307
       307
       -
               ++ lib.optional (lib.versionOlder release_version "16") "strictflexarrays3"

     

       210
       210
       +
               ++ lib.optional (!(targetPlatform.isx86_64 || targetPlatform.isAarch64)) "zerocallusedregs"

     

       308
       211
        
               ++ (finalAttrs.passthru.hardeningUnsupportedFlags or [ ]);

     

       309
       212
        
           };

     

       310
       213
        
       

     
···

       326
       229
        
             mainProgram = "clang";

     

       327
       230
        
           };

     

       328
       231
        
         }

     

       329
       329
       -
         // lib.optionalAttrs enableManpages (

     

       330
       330
       -
           {

     

       331
       331
       -
             pname = "clang-manpages";

     

       232
       232
       +
         // lib.optionalAttrs enableManpages {

     

       233
       233
       +
           pname = "clang-manpages";

     

       234
       234
       +
       

     

       235
       235
       +
           ninjaFlags = [ "docs-clang-man" ];

     

       332
       236
        
       

     

       333
       333
       -
             installPhase = ''

     

       334
       334
       -
               mkdir -p $out/share/man/man1

     

       335
       335
       -
               # Manually install clang manpage

     

       336
       336
       -
               cp docs/man/*.1 $out/share/man/man1/

     

       337
       337
       -
             '';

     

       237
       237
       +
           installPhase = ''

     

       238
       238
       +
             mkdir -p $out/share/man/man1

     

       239
       239
       +
             # Manually install clang manpage

     

       240
       240
       +
             cp docs/man/*.1 $out/share/man/man1/

     

       241
       241
       +
           '';

     

       338
       242
        
       

     

       339
       339
       -
             outputs = [ "out" ];

     

       243
       243
       +
           outputs = [ "out" ];

     

       340
       244
        
       

     

       341
       341
       -
             doCheck = false;

     

       245
       245
       +
           doCheck = false;

     

       342
       246
        
       

     

       343
       343
       -
             meta = llvm_meta // {

     

       344
       344
       -
               description = "man page for Clang ${version}";

     

       345
       345
       -
             };

     

       346
       346
       -
           }

     

       347
       347
       -
           // (

     

       348
       348
       -
             if lib.versionOlder release_version "15" then

     

       349
       349
       -
               {

     

       350
       350
       -
                 buildPhase = ''

     

       351
       351
       -
                   make docs-clang-man

     

       352
       352
       -
                 '';

     

       353
       353
       -
               }

     

       354
       354
       -
             else

     

       355
       355
       -
               {

     

       356
       356
       -
                 ninjaFlags = [ "docs-clang-man" ];

     

       357
       357
       -
               }

     

       358
       358
       -
           )

     

       359
       359
       -
         )

     

       247
       247
       +
           meta = llvm_meta // {

     

       248
       248
       +
             description = "man page for Clang ${version}";

     

       249
       249
       +
           };

     

       250
       250
       +
         }

     

       360
       251
        
       )

-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

+3 -3

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

···

       31
       31
        
             ++ lib.platforms.s390x

     

       32
       32
        
             ++ lib.platforms.wasi

     

       33
       33
        
             ++ lib.platforms.x86

     

       34
       34
       -
             ++ lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv

     

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

     

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

     

       34
       34
       +
             ++ lib.platforms.riscv

     

       35
       35
       +
             ++ lib.platforms.m68k

     

       36
       36
       +
             ++ lib.platforms.loongarch64;

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         releaseInfo =

-75

pkgs/development/compilers/llvm/common/compiler-rt/armv6-mcr-dmb.patch

···

       1
       1
       -
       From a11d1cc41c725ec6dee58f75e4a852a658dd7543 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Khem Raj <raj.khem@gmail.com>

     

       3
       3
       -
       Date: Thu, 10 Mar 2022 19:30:00 -0800

     

       4
       4
       -
       Subject: [PATCH] [builtins] Use mcr for dmb instruction on armv6

     

       5
       5
       -
       

     

       6
       6
       -
       At present compiler-rt cross compiles for armv6 ( -march=armv6 ) but includes

     

       7
       7
       -
       dmb instructions which are only available in armv7+ this causes SIGILL on

     

       8
       8
       -
       clang+compiler-rt compiled components on rpi0w platforms.

     

       9
       9
       -
       

     

       10
       10
       -
       Reviewed By: MaskRay

     

       11
       11
       -
       

     

       12
       12
       -
       Differential Revision: https://reviews.llvm.org/D99282

     

       13
       13
       -
       ---

     

       14
       14
       -
        compiler-rt/lib/builtins/arm/sync-ops.h | 8 ++++----

     

       15
       15
       -
        compiler-rt/lib/builtins/assembly.h     | 8 ++++++++

     

       16
       16
       -
        2 files changed, 12 insertions(+), 4 deletions(-)

     

       17
       17
       -
       

     

       18
       18
       -
       diff --git a/lib/builtins/arm/sync-ops.h b/lib/builtins/arm/sync-ops.h

     

       19
       19
       -
       index c9623249e5d20..7a26170741ad2 100644

     

       20
       20
       -
       --- a/lib/builtins/arm/sync-ops.h

     

       21
       21
       -
       +++ b/lib/builtins/arm/sync-ops.h

     

       22
       22
       -
       @@ -19,14 +19,14 @@

     

       23
       23
       -
          .thumb;                                                                      \

     

       24
       24
       -
          .syntax unified;                                                             \

     

       25
       25
       -
          DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \

     

       26
       26
       -
       -  dmb;                                                                         \

     

       27
       27
       -
       +  DMB;                                                                         \

     

       28
       28
       -
          mov r12, r0;                                                                 \

     

       29
       29
       -
          LOCAL_LABEL(tryatomic_##op) : ldrex r0, [r12];                               \

     

       30
       30
       -
          op(r2, r0, r1);                                                              \

     

       31
       31
       -
          strex r3, r2, [r12];                                                         \

     

       32
       32
       -
          cmp r3, #0;                                                                  \

     

       33
       33
       -
          bne LOCAL_LABEL(tryatomic_##op);                                             \

     

       34
       34
       -
       -  dmb;                                                                         \

     

       35
       35
       -
       +  DMB;                                                                         \

     

       36
       36
       -
          bx lr

     

       37
       37
       -
        

     

       38
       38
       -
        #define SYNC_OP_8(op)                                                          \

     

       39
       39
       -
       @@ -35,14 +35,14 @@

     

       40
       40
       -
          .syntax unified;                                                             \

     

       41
       41
       -
          DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \

     

       42
       42
       -
          push {r4, r5, r6, lr};                                                       \

     

       43
       43
       -
       -  dmb;                                                                         \

     

       44
       44
       -
       +  DMB;                                                                         \

     

       45
       45
       -
          mov r12, r0;                                                                 \

     

       46
       46
       -
          LOCAL_LABEL(tryatomic_##op) : ldrexd r0, r1, [r12];                          \

     

       47
       47
       -
          op(r4, r5, r0, r1, r2, r3);                                                  \

     

       48
       48
       -
          strexd r6, r4, r5, [r12];                                                    \

     

       49
       49
       -
          cmp r6, #0;                                                                  \

     

       50
       50
       -
          bne LOCAL_LABEL(tryatomic_##op);                                             \

     

       51
       51
       -
       -  dmb;                                                                         \

     

       52
       52
       -
       +  DMB;                                                                         \

     

       53
       53
       -
          pop { r4, r5, r6, pc }

     

       54
       54
       -
        

     

       55
       55
       -
        #define MINMAX_4(rD, rN, rM, cmp_kind)                                         \

     

       56
       56
       -
       diff --git a/lib/builtins/assembly.h b/lib/builtins/assembly.h

     

       57
       57
       -
       index 69a3d8620f924..06aa18162e3b4 100644

     

       58
       58
       -
       --- a/lib/builtins/assembly.h

     

       59
       59
       -
       +++ b/lib/builtins/assembly.h

     

       60
       60
       -
       @@ -189,6 +189,14 @@

     

       61
       61
       -
          JMP(ip)

     

       62
       62
       -
        #endif

     

       63
       63
       -
        

     

       64
       64
       -
       +#if __ARM_ARCH >= 7

     

       65
       65
       -
       +#define DMB dmb

     

       66
       66
       -
       +#elif __ARM_ARCH >= 6

     

       67
       67
       -
       +#define DMB mcr p15, #0, r0, c7, c10, #5

     

       68
       68
       -
       +#else

     

       69
       69
       -
       +#error only supported on ARMv6+

     

       70
       70
       -
       +#endif

     

       71
       71
       -
       +

     

       72
       72
       -
        #if defined(USE_THUMB_2)

     

       73
       73
       -
        #define WIDE(op) op.w

     

       74
       74
       -
        #else

     

       75
       75
       -

-34

pkgs/development/compilers/llvm/common/compiler-rt/armv6-scudo-no-yield.patch

···

       1
       1
       -
       From ff0b373b959165477f45d9f5f9a8da471ae111ab Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Ben Wolsieffer <benwolsieffer@gmail.com>

     

       3
       3
       -
       Date: Wed, 7 Dec 2022 18:03:56 -0500

     

       4
       4
       -
       Subject: [PATCH] [scudo][standalone] Only use yield on ARMv6K and newer

     

       5
       5
       -
       

     

       6
       6
       -
       The yield instruction is only available in ARMv6K and newer. It behaves as a

     

       7
       7
       -
       nop on single threaded platforms anyway, so use nop instead on unsupported

     

       8
       8
       -
       architectures.

     

       9
       9
       -
       

     

       10
       10
       -
       Differential Revision: https://reviews.llvm.org/D139600

     

       11
       11
       -
       ---

     

       12
       12
       -
        compiler-rt/lib/scudo/standalone/common.h | 5 +++++

     

       13
       13
       -
        1 file changed, 5 insertions(+)

     

       14
       14
       -
       

     

       15
       15
       -
       diff --git a/lib/scudo/standalone/common.h b/lib/scudo/standalone/common.h

     

       16
       16
       -
       index bc3dfec6dbba..862cda1d4bc4 100644

     

       17
       17
       -
       --- a/lib/scudo/standalone/common.h

     

       18
       18
       -
       +++ b/lib/scudo/standalone/common.h

     

       19
       19
       -
       @@ -109,7 +109,12 @@ inline void yieldProcessor(u8 Count) {

     

       20
       20
       -
        #elif defined(__aarch64__) || defined(__arm__)

     

       21
       21
       -
          __asm__ __volatile__("" ::: "memory");

     

       22
       22
       -
          for (u8 I = 0; I < Count; I++)

     

       23
       23
       -
       +#if __ARM_ARCH >= 6 && !defined(__ARM_ARCH_6__)

     

       24
       24
       -
       +    // yield is supported on ARMv6K and newer

     

       25
       25
       -
            __asm__ __volatile__("yield");

     

       26
       26
       -
       +#else

     

       27
       27
       -
       +    __asm__ __volatile__("nop");

     

       28
       28
       -
       +#endif

     

       29
       29
       -
        #endif

     

       30
       30
       -
          __asm__ __volatile__("" ::: "memory");

     

       31
       31
       -
        }

     

       32
       32
       -
       -- 

     

       33
       33
       -
       2.38.1

     

       34
       34
       -

-52

pkgs/development/compilers/llvm/common/compiler-rt/armv6-sync-ops-no-thumb.patch

···

       1
       1
       -
       From 5017de8ba4b1fe985169cf54590e858a9019a91f Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Khem Raj <raj.khem@gmail.com>

     

       3
       3
       -
       Date: Fri, 11 Mar 2022 16:25:49 -0800

     

       4
       4
       -
       Subject: [PATCH] [builtins] Do not force thumb mode directive in

     

       5
       5
       -
        arm/sync-ops.h

     

       6
       6
       -
       

     

       7
       7
       -
       .thumb_func was not switching mode until [1]

     

       8
       8
       -
       so it did not show up but now that .thumb_func (without argument) is

     

       9
       9
       -
       switching mode, its causing build failures on armv6 ( rpi0 ) even when

     

       10
       10
       -
       build is explicitly asking for this file to be built with -marm (ARM

     

       11
       11
       -
       mode), therefore use DEFINE_COMPILERRT_FUNCTION macro to add function

     

       12
       12
       -
       header which considers arch and mode from compiler cmdline to decide if

     

       13
       13
       -
       the function is built using thumb mode or arm mode.

     

       14
       14
       -
       

     

       15
       15
       -
       [1] https://reviews.llvm.org/D101975

     

       16
       16
       -
       

     

       17
       17
       -
       Note that it also needs https://reviews.llvm.org/D99282

     

       18
       18
       -
       

     

       19
       19
       -
       Reviewed By: peter.smith, MaskRay

     

       20
       20
       -
       

     

       21
       21
       -
       Differential Revision: https://reviews.llvm.org/D104183

     

       22
       22
       -
       ---

     

       23
       23
       -
        compiler-rt/lib/builtins/arm/sync-ops.h | 6 ++----

     

       24
       24
       -
        1 file changed, 2 insertions(+), 4 deletions(-)

     

       25
       25
       -
       

     

       26
       26
       -
       diff --git a/lib/builtins/arm/sync-ops.h b/lib/builtins/arm/sync-ops.h

     

       27
       27
       -
       index 7a26170741ad2..d914f9d3a1093 100644

     

       28
       28
       -
       --- a/lib/builtins/arm/sync-ops.h

     

       29
       29
       -
       +++ b/lib/builtins/arm/sync-ops.h

     

       30
       30
       -
       @@ -16,9 +16,8 @@

     

       31
       31
       -
        

     

       32
       32
       -
        #define SYNC_OP_4(op)                                                          \

     

       33
       33
       -
          .p2align 2;                                                                  \

     

       34
       34
       -
       -  .thumb;                                                                      \

     

       35
       35
       -
          .syntax unified;                                                             \

     

       36
       36
       -
       -  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \

     

       37
       37
       -
       +  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \

     

       38
       38
       -
          DMB;                                                                         \

     

       39
       39
       -
          mov r12, r0;                                                                 \

     

       40
       40
       -
          LOCAL_LABEL(tryatomic_##op) : ldrex r0, [r12];                               \

     

       41
       41
       -
       @@ -31,9 +30,8 @@

     

       42
       42
       -
        

     

       43
       43
       -
        #define SYNC_OP_8(op)                                                          \

     

       44
       44
       -
          .p2align 2;                                                                  \

     

       45
       45
       -
       -  .thumb;                                                                      \

     

       46
       46
       -
          .syntax unified;                                                             \

     

       47
       47
       -
       -  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \

     

       48
       48
       -
       +  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \

     

       49
       49
       -
          push {r4, r5, r6, lr};                                                       \

     

       50
       50
       -
          DMB;                                                                         \

     

       51
       51
       -
          mov r12, r0;                                                                 \

     

       52
       52
       -

-32

pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch

···

       1
       1
       -
       diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake

     

       2
       2
       -
       --- a/cmake/builtin-config-ix.cmake @llvm 15.0.6

     

       3
       3
       -
       +++ b/cmake/builtin-config-ix.cmake

     

       4
       4
       -
       @@ -46,7 +46,7 @@

     

       5
       5
       -
        

     

       6
       6
       -
        set(ARM64 aarch64)

     

       7
       7
       -
       -set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)

     

       8
       8
       -
       +set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)

     

       9
       9
       -
        set(AVR avr)

     

       10
       10
       -
        set(HEXAGON hexagon)

     

       11
       11
       -
        set(X86 i386)

     

       12
       12
       -
        set(X86_64 x86_64)

     

       13
       13
       -
       diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt

     

       14
       14
       -
       --- a/lib/builtins/CMakeLists.txt @llvm 15.0.6

     

       15
       15
       -
       +++ b/lib/builtins/CMakeLists.txt

     

       16
       16
       -
       @@ -565,6 +565,7 @@

     

       17
       17
       -
        set(armv7_SOURCES ${arm_SOURCES})

     

       18
       18
       -
        set(armv7s_SOURCES ${arm_SOURCES})

     

       19
       19
       -
        set(armv7k_SOURCES ${arm_SOURCES})

     

       20
       20
       -
       +set(armv7l_SOURCES ${arm_SOURCES})

     

       21
       21
       -
        set(arm64_SOURCES ${aarch64_SOURCES})

     

       22
       22
       -
        

     

       23
       23
       -
        # macho_embedded archs

     

       24
       24
       -
       @@ -734,7 +735,7 @@

     

       25
       25
       -
          foreach (arch ${BUILTIN_SUPPORTED_ARCH})

     

       26
       26
       -
            if (CAN_TARGET_${arch})

     

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

     

       28
       28
       -
       -      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

       29
       29
       -
       +      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")

     

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

     

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

     

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

+28 -100

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

···

       41
       41
        
         # TODO: Make this account for GCC having libstdcxx, which will help

     

       42
       42
        
         # use clean up the `cmakeFlags` rats nest below.

     

       43
       43
        
         haveLibcxx = stdenv.cc.libcxx != null;

     

       44
       44
       -
         isDarwinStatic =

     

       45
       45
       -
           stdenv.hostPlatform.isDarwin

     

       46
       46
       -
           && stdenv.hostPlatform.isStatic

     

       47
       47
       -
           && lib.versionAtLeast release_version "16";

     

       44
       44
       +
         isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;

     

       48
       45
        
         inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows;

     

       49
       46
        
         noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows;

     

       50
       47
        
       in

     
···

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

     

       59
       56
        
               ''

     

       60
       57
        
                 mkdir -p "$out"

     

       61
       61
       -
               ''

     

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

     

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

     

       64
       59
        
               ''

     

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

     
···

       74
       69
        
       

     

       75
       70
        
         sourceRoot = "${finalAttrs.src.name}/compiler-rt";

     

       76
       71
        
       

     

       77
       77
       -
         patches =

     

       78
       78
       -
           lib.optional (lib.versionOlder release_version "15") (getVersionFile "compiler-rt/codesign.patch") # Revert compiler-rt commit that makes codesign mandatory

     

       79
       79
       -
           ++ [

     

       80
       80
       -
             (getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config

     

       81
       81
       -
             # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       82
       82
       -
             # extra `/`.

     

       83
       83
       -
             (getVersionFile "compiler-rt/normalize-var.patch")

     

       84
       84
       -
             # Fix build on armv6l

     

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

     

       86
       86
       -
           ]

     

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

     

       88
       88
       -
             # fixes the parallel build on aarch64 darwin

     

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

     

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

     

       91
       91
       -
             relative = "compiler-rt";

     

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

     

       93
       93
       -
           })

     

       94
       94
       -
           ++ lib.optional (

     

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

     

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

     

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

     

       98
       98
       -
           ++

     

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

     

       100
       100
       -
               (fetchpatch {

     

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

     

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

     

       103
       103
       -
                 stripLen = 1;

     

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

     

       105
       105
       -
               })

     

       106
       106
       -
           ++

     

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

     

       108
       108
       -
               # Prevent a compilation error on darwin

     

       109
       109
       -
               (getVersionFile "compiler-rt/darwin-targetconditionals.patch")

     

       110
       110
       -
           # TODO: make unconditional and remove in <15 section below. Causes rebuilds.

     

       111
       111
       -
           ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       112
       112
       -
             # See: https://github.com/NixOS/nixpkgs/pull/186575

     

       113
       113
       -
             ./darwin-plistbuddy-workaround.patch

     

       114
       114
       -
           ]

     

       115
       115
       -
           ++

     

       116
       116
       -
             lib.optional (lib.versions.major release_version == "15")

     

       117
       117
       -
               # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893

     

       118
       118
       -
               ./armv7l-15.patch

     

       119
       119
       -
           ++ lib.optionals (lib.versionOlder release_version "15") [

     

       120
       120
       -
             ./darwin-plistbuddy-workaround.patch

     

       121
       121
       -
             (getVersionFile "compiler-rt/armv7l.patch")

     

       122
       122
       -
             # Fix build on armv6l

     

       123
       123
       -
             ./armv6-mcr-dmb.patch

     

       124
       124
       -
             ./armv6-sync-ops-no-thumb.patch

     

       125
       125
       -
           ]

     

       126
       126
       -
           ++

     

       127
       127
       -
             lib.optionals (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "18")

     

       128
       128
       -
               [

     

       129
       129
       -
                 # Fix build on armv6l

     

       130
       130
       -
                 ./armv6-scudo-no-yield.patch

     

       131
       131
       -
               ]

     

       132
       132
       -
           ++ lib.optionals (lib.versionAtLeast release_version "13") [

     

       133
       133
       -
             (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")

     

       134
       134
       -
           ]

     

       135
       135
       -
           ++ lib.optional (lib.versions.major release_version == "19") (fetchpatch {

     

       136
       136
       -
             url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";

     

       137
       137
       -
             hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";

     

       138
       138
       -
             relative = "compiler-rt";

     

       139
       139
       -
           });

     

       72
       72
       +
         patches = [

     

       73
       73
       +
           (getVersionFile "compiler-rt/X86-support-extension.patch") # Add support for i486 i586 i686 by reusing i386 config

     

       74
       74
       +
           # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the

     

       75
       75
       +
           # extra `/`.

     

       76
       76
       +
           (getVersionFile "compiler-rt/normalize-var.patch")

     

       77
       77
       +
           # Fix build on armv6l

     

       78
       78
       +
           ./armv6-no-ldrexd-strexd.patch

     

       79
       79
       +
           # See: https://github.com/NixOS/nixpkgs/pull/186575

     

       80
       80
       +
           ./darwin-plistbuddy-workaround.patch

     

       81
       81
       +
         ]

     

       82
       82
       +
         ++ [

     

       83
       83
       +
           (getVersionFile "compiler-rt/armv6-scudo-libatomic.patch")

     

       84
       84
       +
         ]

     

       85
       85
       +
         ++ lib.optional (lib.versions.major release_version == "19") (fetchpatch {

     

       86
       86
       +
           url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";

     

       87
       87
       +
           hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no=";

     

       88
       88
       +
           relative = "compiler-rt";

     

       89
       89
       +
         });

     

       140
       90
        
       

     

       141
       91
        
         nativeBuildInputs = [

     

       142
       92
        
           cmake

     

       143
       93
        
           python3

     

       144
       94
        
           libllvm.dev

     

       95
       95
       +
           ninja

     

       145
       96
        
         ]

     

       146
       146
       -
         ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)

     

       147
       97
        
         ++ lib.optionals stdenv.hostPlatform.isDarwin [ jq ];

     

       148
       98
        
         buildInputs =

     

       149
       99
        
           lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isRiscV) linuxHeaders

     
···

       181
       131
        
           (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")

     

       182
       132
        
           (lib.cmakeBool "COMPILER_RT_USE_BUILTINS_LIBRARY" true)

     

       183
       133
        
         ]

     

       184
       184
       -
         ++

     

       185
       185
       -
           lib.optionals

     

       186
       186
       -
             ((!haveLibc || bareMetal || isMusl || isAarch64) && (lib.versions.major release_version == "13"))

     

       187
       187
       -
             [

     

       188
       188
       -
               (lib.cmakeBool "COMPILER_RT_BUILD_LIBFUZZER" false)

     

       189
       189
       -
             ]

     

       190
       134
        
         ++ lib.optionals (useLLVM && haveLibc) [

     

       191
       135
        
           (lib.cmakeBool "COMPILER_RT_BUILD_SANITIZERS" true)

     

       192
       136
        
           (lib.cmakeBool "COMPILER_RT_BUILD_PROFILE" true)

     
···

       221
       165
        
           (lib.cmakeFeature "COMPILER_RT_OS_DIR" "baremetal")

     

       222
       166
        
         ]

     

       223
       167
        
         ++ lib.optionals (stdenv.hostPlatform.isDarwin) (

     

       224
       224
       -
           lib.optionals (lib.versionAtLeast release_version "16") [

     

       168
       168
       +
           [

     

       225
       169
        
             (lib.cmakeFeature "CMAKE_LIPO" "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}lipo")

     

       226
       170
        
           ]

     

       227
       171
        
           ++ lib.optionals (!haveLibcxx) [

     
···

       234
       178
        
             (lib.cmakeFeature "DARWIN_osx_ARCHS" stdenv.hostPlatform.darwinArch)

     

       235
       179
        
             (lib.cmakeFeature "DARWIN_osx_BUILTIN_ARCHS" stdenv.hostPlatform.darwinArch)

     

       236
       180
        
             (lib.cmakeFeature "SANITIZER_MIN_OSX_VERSION" stdenv.hostPlatform.darwinMinVersion)

     

       237
       237
       -
           ]

     

       238
       238
       -
           ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       239
       181
        
             # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin:

     

       240
       182
        
             # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153

     

       241
       183
        
             (lib.cmakeBool "COMPILER_RT_ENABLE_IOS" false)

     
···

       272
       214
        
               ''

     

       273
       215
        
                 substituteInPlace lib/builtins/clear_cache.c \

     

       274
       216
        
                   --replace-fail "#include <assert.h>" ""

     

       275
       275
       -
                 substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast release_version "18") "/x86"}.c \

     

       217
       217
       +
                 substituteInPlace lib/builtins/cpu_model/x86.c \

     

       276
       218
        
                   --replace-fail "#include <assert.h>" ""

     

       277
       219
        
               ''

     

       278
       220
        
             )

     

       279
       221
        
           )

     

       280
       280
       -
           +

     

       281
       281
       -
             lib.optionalString

     

       282
       282
       -
               (lib.versionAtLeast release_version "13" && lib.versionOlder release_version "14")

     

       283
       283
       -
               ''

     

       284
       284
       -
                 # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.6/libcxx/utils/merge_archives.py

     

       285
       285
       -
                 # Seems to only be used in v13 though it's present in v12 and v14, and dropped in v15.

     

       286
       286
       -
                 substituteInPlace ../libcxx/utils/merge_archives.py \

     

       287
       287
       -
                   --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \

     

       288
       288
       -
                   --replace-fail "distutils.spawn." ""

     

       289
       289
       -
               ''

     

       290
       222
        
           +

     

       291
       223
        
             lib.optionalString (lib.versionAtLeast release_version "19")

     

       292
       224
        
               # codesign in sigtool doesn't support the various options used by the build

     
···

       297
       229
        
                   --replace-fail 'find_program(CODESIGN codesign)' ""

     

       298
       230
        
               '';

     

       299
       231
        
       

     

       300
       300
       -
         preConfigure =

     

       301
       301
       -
           lib.optionalString (lib.versionOlder release_version "16" && !haveLibc) ''

     

       302
       302
       -
             cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

     

       303
       303
       -
           ''

     

       304
       304
       -
           + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       305
       305
       -
             cmakeFlagsArray+=(

     

       306
       306
       -
               "-DDARWIN_macosx_CACHED_SYSROOT=$SDKROOT"

     

       307
       307
       -
               "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=$(jq -r .Version "$SDKROOT/SDKSettings.json")"

     

       308
       308
       -
             )

     

       309
       309
       -
           '';

     

       232
       232
       +
         preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       233
       233
       +
           cmakeFlagsArray+=(

     

       234
       234
       +
             "-DDARWIN_macosx_CACHED_SYSROOT=$SDKROOT"

     

       235
       235
       +
             "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=$(jq -r .Version "$SDKROOT/SDKSettings.json")"

     

       236
       236
       +
           )

     

       237
       237
       +
         '';

     

       310
       238
        
       

     

       311
       239
        
         # Hack around weird upstream RPATH bug

     

       312
       240
        
         postInstall =

-48

pkgs/development/compilers/llvm/common/compiler-rt/glibc.patch

···

       1
       1
       -
       diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       2
       2
       -
       index 54da635..c5dc1cd 100644

     

       3
       3
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       4
       4
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       5
       5
       -
       @@ -1158,8 +1158,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);

     

       6
       6
       -
        CHECK_SIZE_AND_OFFSET(ipc_perm, gid);

     

       7
       7
       -
        CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);

     

       8
       8
       -
        CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);

     

       9
       9
       -
       -#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)

     

       10
       10
       -
       -/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */

     

       11
       11
       -
       +#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)

     

       12
       12
       -
       +/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit

     

       13
       13
       -
       +   on many architectures.  */

     

       14
       14
       -
        CHECK_SIZE_AND_OFFSET(ipc_perm, mode);

     

       15
       15
       -
        #endif

     

       16
       16
       -
        

     

       17
       17
       -
       diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       18
       18
       -
       index f89a113..f6f986f 100644

     

       19
       19
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       20
       20
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       21
       21
       -
       @@ -213,26 +213,13 @@ namespace __sanitizer {

     

       22
       22
       -
            u64 __unused1;

     

       23
       23
       -
            u64 __unused2;

     

       24
       24
       -
        #elif defined(__sparc__)

     

       25
       25
       -
       -#if defined(__arch64__)

     

       26
       26
       -
            unsigned mode;

     

       27
       27
       -
       -    unsigned short __pad1;

     

       28
       28
       -
       -#else

     

       29
       29
       -
       -    unsigned short __pad1;

     

       30
       30
       -
       -    unsigned short mode;

     

       31
       31
       -
            unsigned short __pad2;

     

       32
       32
       -
       -#endif

     

       33
       33
       -
            unsigned short __seq;

     

       34
       34
       -
            unsigned long long __unused1;

     

       35
       35
       -
            unsigned long long __unused2;

     

       36
       36
       -
       -#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)

     

       37
       37
       -
       -    unsigned int mode;

     

       38
       38
       -
       -    unsigned short __seq;

     

       39
       39
       -
       -    unsigned short __pad1;

     

       40
       40
       -
       -    unsigned long __unused1;

     

       41
       41
       -
       -    unsigned long __unused2;

     

       42
       42
       -
        #else

     

       43
       43
       -
       -    unsigned short mode;

     

       44
       44
       -
       -    unsigned short __pad1;

     

       45
       45
       -
       +    unsigned int mode;

     

       46
       46
       -
            unsigned short __seq;

     

       47
       47
       -
            unsigned short __pad2;

     

       48
       48
       -
        #if defined(__x86_64__) && !defined(_LP64)

-80

pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-9.patch

···

       1
       1
       -
       https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch

     

       2
       2
       -
       https://reviews.llvm.org/D102059

     

       3
       3
       -
       --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

     

       4
       4
       -
       +++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

     

       5
       5
       -
       @@ -370,15 +370,6 @@ static void ioctl_table_fill() {

     

       6
       6
       -
        

     

       7
       7
       -
        #if SANITIZER_GLIBC

     

       8
       8
       -
          // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE

     

       9
       9
       -
       -  _(CYGETDEFTHRESH, WRITE, sizeof(int));

     

       10
       10
       -
       -  _(CYGETDEFTIMEOUT, WRITE, sizeof(int));

     

       11
       11
       -
       -  _(CYGETMON, WRITE, struct_cyclades_monitor_sz);

     

       12
       12
       -
       -  _(CYGETTHRESH, WRITE, sizeof(int));

     

       13
       13
       -
       -  _(CYGETTIMEOUT, WRITE, sizeof(int));

     

       14
       14
       -
       -  _(CYSETDEFTHRESH, NONE, 0);

     

       15
       15
       -
       -  _(CYSETDEFTIMEOUT, NONE, 0);

     

       16
       16
       -
       -  _(CYSETTHRESH, NONE, 0);

     

       17
       17
       -
       -  _(CYSETTIMEOUT, NONE, 0);

     

       18
       18
       -
          _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);

     

       19
       19
       -
          _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);

     

       20
       20
       -
          _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);

     

       21
       21
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       22
       22
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

     

       23
       23
       -
       @@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;

     

       24
       24
       -
        # include <sys/procfs.h>

     

       25
       25
       -
        #endif

     

       26
       26
       -
        #include <sys/user.h>

     

       27
       27
       -
       -#include <linux/cyclades.h>

     

       28
       28
       -
        #include <linux/if_eql.h>

     

       29
       29
       -
        #include <linux/if_plip.h>

     

       30
       30
       -
        #include <linux/lp.h>

     

       31
       31
       -
       @@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

     

       32
       32
       -
        

     

       33
       33
       -
        #if SANITIZER_GLIBC

     

       34
       34
       -
          unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);

     

       35
       35
       -
       -  unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);

     

       36
       36
       -
        #if EV_VERSION > (0x010000)

     

       37
       37
       -
          unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);

     

       38
       38
       -
        #else

     

       39
       39
       -
       @@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);

     

       40
       40
       -
        #endif // SANITIZER_LINUX

     

       41
       41
       -
        

     

       42
       42
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       43
       43
       -
       -  unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;

     

       44
       44
       -
       -  unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;

     

       45
       45
       -
       -  unsigned IOCTL_CYGETMON = CYGETMON;

     

       46
       46
       -
       -  unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;

     

       47
       47
       -
       -  unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;

     

       48
       48
       -
       -  unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;

     

       49
       49
       -
       -  unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;

     

       50
       50
       -
       -  unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;

     

       51
       51
       -
       -  unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;

     

       52
       52
       -
          unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;

     

       53
       53
       -
          unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;

     

       54
       54
       -
          unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;

     

       55
       55
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       56
       56
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       57
       57
       -
       @@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;

     

       58
       58
       -
        

     

       59
       59
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       60
       60
       -
          extern unsigned struct_ax25_parms_struct_sz;

     

       61
       61
       -
       -  extern unsigned struct_cyclades_monitor_sz;

     

       62
       62
       -
          extern unsigned struct_input_keymap_entry_sz;

     

       63
       63
       -
          extern unsigned struct_ipx_config_data_sz;

     

       64
       64
       -
          extern unsigned struct_kbdiacrs_sz;

     

       65
       65
       -
       @@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;

     

       66
       66
       -
        #endif  // SANITIZER_LINUX

     

       67
       67
       -
        

     

       68
       68
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       69
       69
       -
       -  extern unsigned IOCTL_CYGETDEFTHRESH;

     

       70
       70
       -
       -  extern unsigned IOCTL_CYGETDEFTIMEOUT;

     

       71
       71
       -
       -  extern unsigned IOCTL_CYGETMON;

     

       72
       72
       -
       -  extern unsigned IOCTL_CYGETTHRESH;

     

       73
       73
       -
       -  extern unsigned IOCTL_CYGETTIMEOUT;

     

       74
       74
       -
       -  extern unsigned IOCTL_CYSETDEFTHRESH;

     

       75
       75
       -
       -  extern unsigned IOCTL_CYSETDEFTIMEOUT;

     

       76
       76
       -
       -  extern unsigned IOCTL_CYSETTHRESH;

     

       77
       77
       -
       -  extern unsigned IOCTL_CYSETTIMEOUT;

     

       78
       78
       -
          extern unsigned IOCTL_EQL_EMANCIPATE;

     

       79
       79
       -
          extern unsigned IOCTL_EQL_ENSLAVE;

     

       80
       80
       -
          extern unsigned IOCTL_EQL_GETMASTRCFG;

+120 -232

pkgs/development/compilers/llvm/common/default.nix

···

       115
       115
        
           tools:

     

       116
       116
        
           let

     

       117
       117
        
             callPackage = newScope (tools // args // metadata);

     

       118
       118
       -
             clangVersion =

     

       119
       119
       -
               if (lib.versionOlder metadata.release_version "16") then

     

       120
       120
       -
                 metadata.release_version

     

       121
       121
       -
               else

     

       122
       122
       -
                 lib.versions.major metadata.release_version;

     

       118
       118
       +
             clangVersion = lib.versions.major metadata.release_version;

     

       123
       119
        
             mkExtraBuildCommands0 =

     

       124
       120
        
               cc:

     

       125
       121
        
               ''

     
···

       175
       171
        
                 # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).

     

       176
       172
        
                 # So take the only patch known to be necessary.

     

       177
       173
        
                 (metadata.getVersionFile "clang/gnu-install-dirs.patch")

     

       178
       178
       -
               ]

     

       179
       179
       -
               ++

     

       180
       180
       -
                 lib.optional (stdenv.isAarch64 && lib.versions.major metadata.release_version == "17")

     

       181
       181
       -
                   # Fixes llvm17 tblgen builds on aarch64.

     

       182
       182
       -
                   # https://github.com/llvm/llvm-project/issues/106521#issuecomment-2337175680

     

       183
       183
       -
                   (metadata.getVersionFile "clang/aarch64-tblgen.patch");

     

       174
       174
       +
               ];

     

       184
       175
        
             };

     

       185
       176
        
       

     

       186
       177
        
             libclang = callPackage ./clang {

     
···

       242
       233
        
               lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }

     

       243
       234
        
             );

     

       244
       235
        
       

     

       245
       245
       -
             lldb = callPackage ./lldb (

     

       246
       246
       -
               {

     

       247
       247
       -
               }

     

       248
       248
       -
               // lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {

     

       249
       249
       -
                 src = callPackage (

     

       250
       250
       -
                   { runCommand }:

     

       251
       251
       -
                   runCommand "lldb-src-${metadata.version}" { } ''

     

       252
       252
       -
                     mkdir -p "$out"

     

       253
       253
       -
                     cp -r ${monorepoSrc}/cmake "$out"

     

       254
       254
       -
                     cp -r ${monorepoSrc}/lldb "$out"

     

       255
       255
       -
                   ''

     

       256
       256
       -
                 ) { };

     

       236
       236
       +
             lldb = callPackage ./lldb { };

     

       237
       237
       +
       

     

       238
       238
       +
             lldb-manpages = lowPrio (

     

       239
       239
       +
               tools.lldb.override {

     

       240
       240
       +
                 enableManpages = true;

     

       241
       241
       +
                 python3 = pkgs.python3; # don't use python-boot

     

       257
       242
        
               }

     

       258
       243
        
             );

     

       259
       244
        
       

     
···

       273
       258
        
       

     

       274
       259
        
             bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };

     

       275
       260
        
       

     

       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
       -
             );

     

       261
       261
       +
             clangUseLLVM = wrapCCWith rec {

     

       262
       262
       +
               cc = tools.clang-unwrapped;

     

       263
       263
       +
               libcxx = targetLlvmLibraries.libcxx;

     

       264
       264
       +
               bintools = bintools';

     

       265
       265
       +
               extraPackages = [

     

       266
       266
       +
                 targetLlvmLibraries.compiler-rt

     

       267
       267
       +
               ]

     

       268
       268
       +
               ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [

     

       269
       269
       +
                 targetLlvmLibraries.libunwind

     

       270
       270
       +
               ];

     

       271
       271
       +
               extraBuildCommands = mkExtraBuildCommands cc;

     

       272
       272
       +
               nixSupport.cc-cflags = [

     

       273
       273
       +
                 "-rtlib=compiler-rt"

     

       274
       274
       +
                 "-Wno-unused-command-line-argument"

     

       275
       275
       +
                 "-B${targetLlvmLibraries.compiler-rt}/lib"

     

       276
       276
       +
               ]

     

       277
       277
       +
               ++ lib.optional (

     

       278
       278
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       279
       279
       +
               ) "--unwindlib=libunwind"

     

       280
       280
       +
               ++ lib.optional (

     

       281
       281
       +
                 !stdenv.targetPlatform.isWasm

     

       282
       282
       +
                 && !stdenv.targetPlatform.isFreeBSD

     

       283
       283
       +
                 && stdenv.targetPlatform.useLLVM or false

     

       284
       284
       +
               ) "-lunwind"

     

       285
       285
       +
               ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       286
       286
       +
               nixSupport.cc-ldflags = lib.optionals (

     

       287
       287
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD

     

       288
       288
       +
               ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       289
       289
       +
             };

     

       326
       290
        
       

     

       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
       -
                     ''

     

       291
       291
       +
             clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {

     

       292
       292
       +
               cc = tools.clang-unwrapped;

     

       293
       293
       +
               libcxx = targetLlvmLibraries.libcxx;

     

       294
       294
       +
               bintools = bintools';

     

       295
       295
       +
               extraPackages = [

     

       296
       296
       +
                 targetLlvmLibraries.compiler-rt-no-libc

     

       297
       297
       +
               ]

     

       298
       298
       +
               ++

     

       299
       299
       +
                 lib.optionals

     

       300
       300
       +
                   (

     

       301
       301
       +
                     !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       359
       302
        
                   )

     

       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
       -
             );

     

       303
       303
       +
                   [

     

       304
       304
       +
                     targetLlvmLibraries.libunwind

     

       305
       305
       +
                   ];

     

       306
       306
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       307
       307
       +
               nixSupport.cc-cflags = [

     

       308
       308
       +
                 "-rtlib=compiler-rt"

     

       309
       309
       +
                 "-Wno-unused-command-line-argument"

     

       310
       310
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       311
       311
       +
               ]

     

       312
       312
       +
               ++ lib.optional (

     

       313
       313
       +
                 !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin

     

       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 && !stdenv.targetPlatform.isDarwin

     

       323
       323
       +
               ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

     

       324
       324
       +
             };

     

       382
       325
        
       

     

       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
       -
             );

     

       326
       326
       +
             clangWithLibcAndBasicRt = wrapCCWith rec {

     

       327
       327
       +
               cc = tools.clang-unwrapped;

     

       328
       328
       +
               libcxx = null;

     

       329
       329
       +
               bintools = bintools';

     

       330
       330
       +
               extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       331
       331
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       332
       332
       +
               nixSupport.cc-cflags = [

     

       333
       333
       +
                 "-rtlib=compiler-rt"

     

       334
       334
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       335
       335
       +
                 "-nostdlib++"

     

       336
       336
       +
               ]

     

       337
       337
       +
               ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       338
       338
       +
             };

     

       408
       339
        
       

     

       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
       -
             );

     

       340
       340
       +
             clangNoLibcWithBasicRt = wrapCCWith rec {

     

       341
       341
       +
               cc = tools.clang-unwrapped;

     

       342
       342
       +
               libcxx = null;

     

       343
       343
       +
               bintools = bintoolsNoLibc';

     

       344
       344
       +
               extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];

     

       345
       345
       +
               extraBuildCommands = mkExtraBuildCommandsBasicRt cc;

     

       346
       346
       +
               nixSupport.cc-cflags = [

     

       347
       347
       +
                 "-rtlib=compiler-rt"

     

       348
       348
       +
                 "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"

     

       349
       349
       +
               ]

     

       350
       350
       +
               ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       351
       351
       +
             };

     

       432
       352
        
       

     

       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
       -
                 # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.

     

       444
       444
       -
                 nixSupport.cc-cflags = lib.optional (

     

       445
       445
       -
                   lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       446
       446
       -
                 ) "-fno-exceptions";

     

       447
       447
       -
               }

     

       448
       448
       -
             );

     

       353
       353
       +
             clangNoLibcNoRt = wrapCCWith rec {

     

       354
       354
       +
               cc = tools.clang-unwrapped;

     

       355
       355
       +
               libcxx = null;

     

       356
       356
       +
               bintools = bintoolsNoLibc';

     

       357
       357
       +
               extraPackages = [ ];

     

       358
       358
       +
               # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.

     

       359
       359
       +
               extraBuildCommands = mkExtraBuildCommands0 cc;

     

       360
       360
       +
               nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

     

       361
       361
       +
             };

     

       449
       362
        
       

     

       450
       363
        
             # This is an "oddly ordered" bootstrap just for Darwin. Probably

     

       451
       364
        
             # don't want it otherwise.

     
···

       457
       370
        
                 extraPackages = [ ];

     

       458
       371
        
                 extraBuildCommands = mkExtraBuildCommands0 cc;

     

       459
       372
        
               }

     

       460
       460
       -
               // lib.optionalAttrs (

     

       461
       461
       -
                 lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm

     

       462
       462
       -
               ) { nixSupport.cc-cflags = [ "-fno-exceptions" ]; };

     

       373
       373
       +
               # FIXME: This should be inside the `wrapCCWith` call.

     

       374
       374
       +
               // lib.optionalAttrs stdenv.targetPlatform.isWasm {

     

       375
       375
       +
                 nixSupport.cc-cflags = [ "-fno-exceptions" ];

     

       376
       376
       +
               };

     

       463
       377
        
       

     

       464
       378
        
             # Aliases

     

       465
       379
        
             clangNoCompilerRt = tools.clangNoLibcNoRt;

     

       466
       380
        
             clangNoLibc = tools.clangNoLibcWithBasicRt;

     

       467
       381
        
             clangNoLibcxx = tools.clangWithLibcAndBasicRt;

     

       468
       468
       -
           }

     

       469
       469
       -
           // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "15") {

     

       470
       470
       -
             # TODO: pre-15: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins'

     

       471
       471
       -
             lldb-manpages = lowPrio (

     

       472
       472
       -
               tools.lldb.override {

     

       473
       473
       -
                 enableManpages = true;

     

       474
       474
       -
                 python3 = pkgs.python3; # don't use python-boot

     

       475
       475
       -
               }

     

       476
       476
       -
             );

     

       477
       477
       -
           }

     

       478
       478
       -
           // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "16") {

     

       382
       382
       +
       

     

       479
       383
        
             mlir = callPackage ./mlir { };

     

       480
       384
        
           }

     

       481
       385
        
           // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {

     

       482
       386
        
             bolt = callPackage ./bolt {

     

       483
       387
        
             };

     

       484
       388
        
           }

     

       485
       485
       -
           //

     

       486
       486
       -
             lib.optionalAttrs

     

       487
       487
       -
               (lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "22")

     

       488
       488
       -
               {

     

       489
       489
       -
                 libclc = callPackage ./libclc { };

     

       490
       490
       -
               }

     

       389
       389
       +
           // lib.optionalAttrs (lib.versionOlder metadata.release_version "22") {

     

       390
       390
       +
             libclc = callPackage ./libclc { };

     

       391
       391
       +
           }

     

       491
       392
        
           // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {

     

       492
       393
        
             flang = callPackage ./flang {

     

       493
       394
        
               mlir = tools.mlir;

     
···

       498
       399
        
         libraries = lib.makeExtensible (

     

       499
       400
        
           libraries:

     

       500
       401
        
           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
       -
             );

     

       402
       402
       +
             callPackage = newScope (libraries // buildLlvmTools // args // metadata);

     

       509
       403
        
           in

     

       510
       404
        
           (

     

       511
       405
        
             {

     
···

       561
       455
        
       

     

       562
       456
        
               libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;

     

       563
       457
        
       

     

       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
       -
               );

     

       458
       458
       +
               libcxx = callPackage ./libcxx {

     

       459
       459
       +
                 stdenv =

     

       460
       460
       +
                   if stdenv.hostPlatform.isDarwin then

     

       461
       461
       +
                     overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt

     

       462
       462
       +
                   else

     

       463
       463
       +
                     overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

     

       464
       464
       +
               };

     

       577
       465
        
       

     

       578
       466
        
               libunwind = callPackage ./libunwind {

     

       579
       467
        
                 stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;

+1 -1

pkgs/development/compilers/llvm/common/libc/default.nix

···

       42
       42
        
         nativeBuildInputs = [

     

       43
       43
        
           cmake

     

       44
       44
        
           python3

     

       45
       45
       +
           ninja

     

       45
       46
        
         ]

     

       46
       46
       -
         ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)

     

       47
       47
        
         ++ (lib.optional isFullBuild python3Packages.pyyaml);

     

       48
       48
        
       

     

       49
       49
        
         buildInputs = lib.optional isFullBuild linuxHeaders;

+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

+125 -206

pkgs/development/compilers/llvm/common/libcxx/default.nix

···

       33
       33
        
         # Note: useLLVM is likely false for Darwin but true under pkgsLLVM

     

       34
       34
        
         useLLVM = stdenv.hostPlatform.useLLVM or false;

     

       35
       35
        
       

     

       36
       36
       -
         cxxabiCMakeFlags =

     

       37
       37
       -
           lib.optionals (lib.versionAtLeast release_version "18") [

     

       38
       38
       -
             (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

     

       39
       39
       -
           ]

     

       40
       40
       -
           ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) (

     

       41
       41
       -
             if lib.versionAtLeast release_version "18" then

     

       42
       42
       -
               [

     

       43
       43
       -
                 (lib.cmakeFeature "LIBCXXABI_ADDITIONAL_LIBRARIES" "unwind")

     

       44
       44
       -
                 (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       45
       45
       -
               ]

     

       46
       46
       -
             else

     

       47
       47
       -
               [

     

       48
       48
       -
                 (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       49
       49
       -
                 (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" true)

     

       50
       50
       -
               ]

     

       51
       51
       -
           )

     

       52
       52
       -
           ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       53
       53
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_THREADS" false)

     

       54
       54
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_EXCEPTIONS" false)

     

       55
       55
       -
           ]

     

       56
       56
       -
           ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [

     

       57
       57
       -
             # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245

     

       58
       58
       -
             (lib.cmakeBool "LIBCXXABI_ENABLE_SHARED" false)

     

       59
       59
       -
           ];

     

       36
       36
       +
         cxxabiCMakeFlags = [

     

       37
       37
       +
           (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

     

       38
       38
       +
         ]

     

       39
       39
       +
         ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [

     

       40
       40
       +
           (lib.cmakeFeature "LIBCXXABI_ADDITIONAL_LIBRARIES" "unwind")

     

       41
       41
       +
           (lib.cmakeBool "LIBCXXABI_USE_COMPILER_RT" true)

     

       42
       42
       +
         ]

     

       43
       43
       +
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       44
       44
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_THREADS" false)

     

       45
       45
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_EXCEPTIONS" false)

     

       46
       46
       +
         ]

     

       47
       47
       +
         ++ lib.optionals (!enableShared || stdenv.hostPlatform.isWindows) [

     

       48
       48
       +
           # Required on Windows due to https://github.com/llvm/llvm-project/issues/55245

     

       49
       49
       +
           (lib.cmakeBool "LIBCXXABI_ENABLE_SHARED" false)

     

       50
       50
       +
         ];

     

       60
       51
        
       

     

       61
       52
        
         cxxCMakeFlags = [

     

       62
       53
        
           (lib.cmakeFeature "LIBCXX_CXX_ABI" cxxabiName)

     
···

       64
       55
        
           # https://github.com/llvm/llvm-project/issues/55245

     

       65
       56
        
           (lib.cmakeBool "LIBCXX_ENABLE_STATIC_ABI_LIBRARY" stdenv.hostPlatform.isWindows)

     

       66
       57
        
         ]

     

       67
       67
       -
         ++ lib.optionals (cxxabi == null && lib.versionAtLeast release_version "16") [

     

       68
       68
       -
           # Note: llvm < 16 doesn't support this flag (or it's broken); handled in postInstall instead.

     

       58
       58
       +
         ++ lib.optionals (cxxabi == null) [

     

       69
       59
        
           # Include libc++abi symbols within libc++.a for static linking libc++;

     

       70
       60
        
           # dynamic linking includes them through libc++.so being a linker script

     

       71
       61
        
           # which includes both shared objects.

     
···

       78
       68
        
           (lib.cmakeFeature "LIBCXX_HAS_MUSL_LIBC" "1")

     

       79
       69
        
         ]

     

       80
       70
        
         ++

     

       81
       81
       -
           lib.optionals

     

       82
       82
       -
             (

     

       83
       83
       -
               lib.versionAtLeast release_version "18"

     

       84
       84
       -
               && !useLLVM

     

       85
       85
       -
               && stdenv.hostPlatform.libc == "glibc"

     

       86
       86
       -
               && !stdenv.hostPlatform.isStatic

     

       87
       87
       -
             )

     

       71
       71
       +
           lib.optionals (!useLLVM && stdenv.hostPlatform.libc == "glibc" && !stdenv.hostPlatform.isStatic)

     

       88
       72
        
             [

     

       89
       73
        
               (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "gcc_s")

     

       90
       74
        
             ]

     

       91
       91
       -
         ++ lib.optionals (lib.versionAtLeast release_version "18" && stdenv.hostPlatform.isFreeBSD) [

     

       75
       75
       +
         ++ lib.optionals stdenv.hostPlatform.isFreeBSD [

     

       92
       76
        
           # Name and documentation claim this is for libc++abi, but its man effect is adding `-lunwind`

     

       93
       77
        
           # to the libc++.so linker script. We want FreeBSD's so-called libgcc instead of libunwind.

     

       94
       78
        
           (lib.cmakeBool "LIBCXXABI_USE_LLVM_UNWINDER" false)

     
···

       96
       80
        
         ++ lib.optionals useLLVM [

     

       97
       81
        
           (lib.cmakeBool "LIBCXX_USE_COMPILER_RT" true)

     

       98
       82
        
         ]

     

       99
       99
       -
         ++

     

       100
       100
       -
           lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD && lib.versionAtLeast release_version "16")

     

       101
       101
       -
             [

     

       102
       102
       -
               (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")

     

       103
       103
       -
             ]

     

       83
       83
       +
         ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isFreeBSD) [

     

       84
       84
       +
           (lib.cmakeFeature "LIBCXX_ADDITIONAL_LIBRARIES" "unwind")

     

       85
       85
       +
         ]

     

       104
       86
        
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       105
       87
        
           (lib.cmakeBool "LIBCXX_ENABLE_THREADS" false)

     

       106
       88
        
           (lib.cmakeBool "LIBCXX_ENABLE_FILESYSTEM" false)

     
···

       113
       95
        
         cmakeFlags = [

     

       114
       96
        
           (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" (lib.concatStringsSep ";" runtimes))

     

       115
       97
        
         ]

     

       116
       116
       -
         ++

     

       117
       117
       -
           lib.optionals

     

       118
       118
       -
             (

     

       119
       119
       -
               stdenv.hostPlatform.isWasm

     

       120
       120
       -
               || (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin)

     

       121
       121
       -
             )

     

       122
       122
       -
             [

     

       123
       123
       -
               (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       124
       124
       -
             ]

     

       125
       98
        
         ++ lib.optionals stdenv.hostPlatform.isWasm [

     

       99
       99
       +
           (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       126
       100
        
           (lib.cmakeBool "CMAKE_C_COMPILER_WORKS" true)

     

       127
       101
        
           (lib.cmakeBool "UNIX" true) # Required otherwise libc++ fails to detect the correct linker

     

       128
       102
        
         ]

     
···

       132
       106
        
       

     

       133
       107
        
       in

     

       134
       108
        
       

     

       135
       135
       -
       stdenv.mkDerivation (

     

       136
       136
       -
         finalAttrs:

     

       137
       137
       -
         {

     

       138
       138
       -
           pname = "libcxx";

     

       139
       139
       -
           inherit version cmakeFlags;

     

       109
       109
       +
       stdenv.mkDerivation (finalAttrs: {

     

       110
       110
       +
         pname = "libcxx";

     

       111
       111
       +
         inherit version cmakeFlags;

     

       140
       112
        
       

     

       141
       141
       -
           src =

     

       142
       142
       -
             if monorepoSrc != null then

     

       143
       143
       -
               runCommand "libcxx-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       144
       144
       -
                 ''

     

       145
       145
       -
                   mkdir -p "$out/llvm"

     

       146
       146
       -
                 ''

     

       147
       147
       -
                 + (lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       148
       148
       -
                   cp -r ${monorepoSrc}/cmake "$out"

     

       149
       149
       -
                 '')

     

       150
       150
       -
                 + ''

     

       151
       151
       -
                   cp -r ${monorepoSrc}/libcxx "$out"

     

       152
       152
       -
                   cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"

     

       153
       153
       -
                   cp -r ${monorepoSrc}/llvm/utils "$out/llvm"

     

       154
       154
       -
                 ''

     

       155
       155
       -
                 + (lib.optionalString (lib.versionAtLeast release_version "14") ''

     

       156
       156
       -
                   cp -r ${monorepoSrc}/third-party "$out"

     

       157
       157
       -
                 '')

     

       158
       158
       -
                 + (lib.optionalString (lib.versionAtLeast release_version "20") ''

     

       159
       159
       -
                   cp -r ${monorepoSrc}/libc "$out"

     

       160
       160
       -
                 '')

     

       161
       161
       -
                 + ''

     

       162
       162
       -
                   cp -r ${monorepoSrc}/runtimes "$out"

     

       163
       163
       -
                 ''

     

       164
       164
       -
                 + (lib.optionalString (cxxabi == null) ''

     

       165
       165
       -
                   cp -r ${monorepoSrc}/libcxxabi "$out"

     

       166
       166
       -
                 '')

     

       167
       167
       -
               )

     

       168
       168
       -
             else

     

       169
       169
       -
               src;

     

       113
       113
       +
         src =

     

       114
       114
       +
           if monorepoSrc != null then

     

       115
       115
       +
             runCommand "libcxx-src-${version}" { inherit (monorepoSrc) passthru; } (

     

       116
       116
       +
               ''

     

       117
       117
       +
                 mkdir -p "$out/llvm"

     

       118
       118
       +
                 cp -r ${monorepoSrc}/cmake "$out"

     

       119
       119
       +
                 cp -r ${monorepoSrc}/libcxx "$out"

     

       120
       120
       +
                 cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"

     

       121
       121
       +
                 cp -r ${monorepoSrc}/llvm/utils "$out/llvm"

     

       122
       122
       +
                 cp -r ${monorepoSrc}/third-party "$out"

     

       123
       123
       +
               ''

     

       124
       124
       +
               + (lib.optionalString (lib.versionAtLeast release_version "20") ''

     

       125
       125
       +
                 cp -r ${monorepoSrc}/libc "$out"

     

       126
       126
       +
               '')

     

       127
       127
       +
               + ''

     

       128
       128
       +
                 cp -r ${monorepoSrc}/runtimes "$out"

     

       129
       129
       +
               ''

     

       130
       130
       +
               + (lib.optionalString (cxxabi == null) ''

     

       131
       131
       +
                 cp -r ${monorepoSrc}/libcxxabi "$out"

     

       132
       132
       +
               '')

     

       133
       133
       +
             )

     

       134
       134
       +
           else

     

       135
       135
       +
             src;

     

       136
       136
       +
       

     

       137
       137
       +
         outputs = [

     

       138
       138
       +
           "out"

     

       139
       139
       +
           "dev"

     

       140
       140
       +
         ];

     

       170
       141
        
       

     

       171
       171
       -
           outputs = [

     

       172
       172
       -
             "out"

     

       173
       173
       -
             "dev"

     

       174
       174
       -
           ];

     

       142
       142
       +
         preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

     

       143
       143
       +
           patchShebangs utils/cat_files.py

     

       144
       144
       +
         '';

     

       175
       145
        
       

     

       176
       176
       -
           preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''

     

       177
       177
       -
             patchShebangs utils/cat_files.py

     

       178
       178
       -
           '';

     

       146
       146
       +
         # TODO: Remove on `staging`.

     

       147
       147
       +
         patches = [ ];

     

       179
       148
        
       

     

       180
       180
       -
           patches = lib.optionals (lib.versionOlder release_version "16") (

     

       181
       181
       -
             lib.optional (lib.versions.major release_version == "15")

     

       182
       182
       -
               # See:

     

       183
       183
       -
               #   - https://reviews.llvm.org/D133566

     

       184
       184
       -
               #   - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432

     

       185
       185
       -
               # !!! Drop in LLVM 16+

     

       186
       186
       -
               (

     

       187
       187
       -
                 fetchpatch {

     

       188
       188
       -
                   url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch";

     

       189
       189
       -
                   hash = "sha256-B07vHmSjy5BhhkGSj3e1E0XmMv5/9+mvC/k70Z29VwY=";

     

       190
       190
       -
                 }

     

       191
       191
       -
               )

     

       192
       192
       -
             ++ [

     

       193
       193
       -
               (substitute {

     

       194
       194
       -
                 src = ../libcxxabi/wasm.patch;

     

       195
       195
       -
                 substitutions = [

     

       196
       196
       -
                   "--replace-fail"

     

       197
       197
       -
                   "/cmake/"

     

       198
       198
       -
                   "/llvm/cmake/"

     

       199
       199
       -
                 ];

     

       200
       200
       -
               })

     

       201
       201
       -
             ]

     

       202
       202
       -
             ++ lib.optional stdenv.hostPlatform.isMusl (substitute {

     

       203
       203
       -
               src = ./libcxx-0001-musl-hacks.patch;

     

       204
       204
       -
               substitutions = [

     

       205
       205
       -
                 "--replace-fail"

     

       206
       206
       -
                 "/include/"

     

       207
       207
       -
                 "/libcxx/include/"

     

       208
       208
       -
               ];

     

       209
       209
       -
             })

     

       210
       210
       -
           );

     

       149
       149
       +
         nativeBuildInputs = [

     

       150
       150
       +
           cmake

     

       151
       151
       +
           ninja

     

       152
       152
       +
           python3

     

       153
       153
       +
         ]

     

       154
       154
       +
         ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames

     

       155
       155
       +
         ++ lib.optional (cxxabi != null) lndir;

     

       211
       156
        
       

     

       212
       212
       -
           nativeBuildInputs = [

     

       213
       213
       -
             cmake

     

       214
       214
       -
             ninja

     

       215
       215
       -
             python3

     

       216
       216
       -
           ]

     

       217
       217
       -
           ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames

     

       218
       218
       -
           ++ lib.optional (cxxabi != null) lndir;

     

       157
       157
       +
         buildInputs = [

     

       158
       158
       +
           cxxabi

     

       159
       159
       +
         ]

     

       160
       160
       +
         ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isFreeBSD) [

     

       161
       161
       +
           libunwind

     

       162
       162
       +
         ];

     

       219
       163
        
       

     

       220
       220
       -
           buildInputs = [

     

       221
       221
       -
             cxxabi

     

       222
       222
       -
           ]

     

       223
       223
       -
           ++ lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm && !stdenv.hostPlatform.isFreeBSD) [

     

       224
       224
       -
             libunwind

     

       225
       225
       -
           ];

     

       164
       164
       +
         # TODO: Possibly move back to `sourceRoot` on `staging`?

     

       165
       165
       +
         postPatch = ''

     

       166
       166
       +
           cd runtimes

     

       167
       167
       +
         '';

     

       226
       168
        
       

     

       227
       227
       -
           # libc++.so is a linker script which expands to multiple libraries,

     

       228
       228
       -
           # libc++.so.1 and libc++abi.so or the external cxxabi. ld-wrapper doesn't

     

       229
       229
       -
           # support linker scripts so the external cxxabi needs to be symlinked in

     

       230
       230
       -
           postInstall =

     

       231
       231
       -
             lib.optionalString (cxxabi != null) ''

     

       232
       232
       -
               lndir ${lib.getDev cxxabi}/include $dev/include/c++/v1

     

       233
       233
       -
               lndir ${lib.getLib cxxabi}/lib $out/lib

     

       234
       234
       -
               libcxxabi=$out/lib/lib${cxxabi.libName}.a

     

       235
       235
       -
             ''

     

       236
       236
       -
             # LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON doesn't work for LLVM < 16 or

     

       237
       237
       -
             # external cxxabi libraries so merge libc++abi.a into libc++.a ourselves.

     

       169
       169
       +
         # libc++.so is a linker script which expands to multiple libraries,

     

       170
       170
       +
         # libc++.so.1 and libc++abi.so or the external cxxabi. ld-wrapper doesn't

     

       171
       171
       +
         # support linker scripts so the external cxxabi needs to be symlinked in

     

       172
       172
       +
         postInstall =

     

       173
       173
       +
           lib.optionalString (cxxabi != null) ''

     

       174
       174
       +
             lndir ${lib.getDev cxxabi}/include $dev/include/c++/v1

     

       175
       175
       +
             lndir ${lib.getLib cxxabi}/lib $out/lib

     

       176
       176
       +
             libcxxabi=$out/lib/lib${cxxabi.libName}.a

     

       177
       177
       +
           ''

     

       178
       178
       +
           # LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON doesn't work for

     

       179
       179
       +
           # external cxxabi libraries so merge libc++abi.a into libc++.a ourselves.

     

       238
       180
        
       

     

       239
       239
       -
             # GNU binutils emits objects in LIFO order in MRI scripts so after the merge

     

       240
       240
       -
             # the objects are in reversed order so a second MRI script is required so the

     

       241
       241
       -
             # objects in the archive are listed in proper order (libc++.a, libc++abi.a)

     

       242
       242
       -
             + lib.optionalString (cxxabi != null || lib.versionOlder release_version "16") ''

     

       243
       243
       -
               libcxxabi=''${libcxxabi-$out/lib/libc++abi.a}

     

       244
       244
       -
               if [[ -f $out/lib/libc++.a && -e $libcxxabi ]]; then

     

       245
       245
       -
                 $AR -M <<MRI

     

       246
       246
       -
                   create $out/lib/libc++.a

     

       247
       247
       -
                   addlib $out/lib/libc++.a

     

       248
       248
       -
                   addlib $libcxxabi

     

       249
       249
       -
                   save

     

       250
       250
       -
                   end

     

       251
       251
       -
               MRI

     

       252
       252
       -
                 $AR -M <<MRI

     

       253
       253
       -
                   create $out/lib/libc++.a

     

       254
       254
       -
                   addlib $out/lib/libc++.a

     

       255
       255
       -
                   save

     

       256
       256
       -
                   end

     

       257
       257
       -
               MRI

     

       258
       258
       -
               fi

     

       259
       259
       -
             '';

     

       181
       181
       +
           # GNU binutils emits objects in LIFO order in MRI scripts so after the merge

     

       182
       182
       +
           # the objects are in reversed order so a second MRI script is required so the

     

       183
       183
       +
           # objects in the archive are listed in proper order (libc++.a, libc++abi.a)

     

       184
       184
       +
           + lib.optionalString (cxxabi != null) ''

     

       185
       185
       +
             libcxxabi=''${libcxxabi-$out/lib/libc++abi.a}

     

       186
       186
       +
             if [[ -f $out/lib/libc++.a && -e $libcxxabi ]]; then

     

       187
       187
       +
               $AR -M <<MRI

     

       188
       188
       +
                 create $out/lib/libc++.a

     

       189
       189
       +
                 addlib $out/lib/libc++.a

     

       190
       190
       +
                 addlib $libcxxabi

     

       191
       191
       +
                 save

     

       192
       192
       +
                 end

     

       193
       193
       +
             MRI

     

       194
       194
       +
               $AR -M <<MRI

     

       195
       195
       +
                 create $out/lib/libc++.a

     

       196
       196
       +
                 addlib $out/lib/libc++.a

     

       197
       197
       +
                 save

     

       198
       198
       +
                 end

     

       199
       199
       +
             MRI

     

       200
       200
       +
             fi

     

       201
       201
       +
           '';

     

       260
       202
        
       

     

       261
       261
       -
           passthru = {

     

       262
       262
       -
             isLLVM = true;

     

       263
       263
       -
           };

     

       203
       203
       +
         passthru = {

     

       204
       204
       +
           isLLVM = true;

     

       205
       205
       +
         };

     

       264
       206
        
       

     

       265
       265
       -
           meta = llvm_meta // {

     

       266
       266
       -
             homepage = "https://libcxx.llvm.org/";

     

       267
       267
       -
             description = "C++ standard library";

     

       268
       268
       -
             longDescription = ''

     

       269
       269
       -
               libc++ is an implementation of the C++ standard library, targeting C++11,

     

       270
       270
       -
               C++14 and above.

     

       271
       271
       -
             '';

     

       272
       272
       -
             # "All of the code in libc++ is dual licensed under the MIT license and the

     

       273
       273
       -
             # UIUC License (a BSD-like license)":

     

       274
       274
       -
             license = with lib.licenses; [

     

       275
       275
       -
               mit

     

       276
       276
       -
               ncsa

     

       277
       277
       -
             ];

     

       278
       278
       -
           };

     

       279
       279
       -
         }

     

       280
       280
       -
         // (

     

       281
       281
       -
           if (lib.versionOlder release_version "16" || lib.versionAtLeast release_version "17") then

     

       282
       282
       -
             {

     

       283
       283
       -
               postPatch =

     

       284
       284
       -
                 (lib.optionalString

     

       285
       285
       -
                   (lib.versionAtLeast release_version "14" && lib.versionOlder release_version "15")

     

       286
       286
       -
                   ''

     

       287
       287
       -
                     # fix CMake error when static and LIBCXXABI_USE_LLVM_UNWINDER=ON. aren't

     

       288
       288
       -
                     # building unwind so don't need to depend on it

     

       289
       289
       -
                     substituteInPlace libcxx/src/CMakeLists.txt \

     

       290
       290
       -
                       --replace-fail "add_dependencies(cxx_static unwind)" "# add_dependencies(cxx_static unwind)"

     

       291
       291
       -
                   ''

     

       292
       292
       -
                 )

     

       293
       293
       -
                 + ''

     

       294
       294
       -
                   cd runtimes

     

       295
       295
       -
                 '';

     

       296
       296
       -
             }

     

       297
       297
       -
           else

     

       298
       298
       -
             {

     

       299
       299
       -
               sourceRoot = "${finalAttrs.src.name}/runtimes";

     

       300
       300
       -
             }

     

       301
       301
       -
         )

     

       302
       302
       -
       )

     

       207
       207
       +
         meta = llvm_meta // {

     

       208
       208
       +
           homepage = "https://libcxx.llvm.org/";

     

       209
       209
       +
           description = "C++ standard library";

     

       210
       210
       +
           longDescription = ''

     

       211
       211
       +
             libc++ is an implementation of the C++ standard library, targeting C++11,

     

       212
       212
       +
             C++14 and above.

     

       213
       213
       +
           '';

     

       214
       214
       +
           # "All of the code in libc++ is dual licensed under the MIT license and the

     

       215
       215
       +
           # UIUC License (a BSD-like license)":

     

       216
       216
       +
           license = with lib.licenses; [

     

       217
       217
       +
             mit

     

       218
       218
       +
             ncsa

     

       219
       219
       +
           ];

     

       220
       220
       +
         };

     

       221
       221
       +
       })

-39

pkgs/development/compilers/llvm/common/libcxx/libcxx-0001-musl-hacks.patch

···

       1
       1
       -
       From 1c936d7fda3275265e37f93697232a1ed652390f Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       -
       Date: Sat, 9 Jul 2016 19:22:54 -0500

     

       4
       4
       -
       Subject: [PATCH] musl fixes/hacks

     

       5
       5
       -
       

     

       6
       6
       -
       Conflicts:

     

       7
       7
       -
       

     

       8
       8
       -
       	include/__config

     

       9
       9
       -
       	include/locale

     

       10
       10
       -
       	src/locale.cpp

     

       11
       11
       -
       ---

     

       12
       12
       -
        include/locale |    4 ++--

     

       13
       13
       -
        1 files changed, 2 insertions(+), 2 deletions(-)

     

       14
       14
       -
       

     

       15
       15
       -
       diff --git a/include/locale b/include/locale

     

       16
       16
       -
       index 3d804e8..9b01f5b 100644

     

       17
       17
       -
       --- a/include/locale

     

       18
       18
       -
       +++ b/include/locale

     

       19
       19
       -
       @@ -695,7 +695,7 @@ __num_get_signed_integral(const char* __a, const char* __a_end,

     

       20
       20
       -
                typename remove_reference<decltype(errno)>::type __save_errno = errno;

     

       21
       21
       -
                errno = 0;

     

       22
       22
       -
                char *__p2;

     

       23
       23
       -
       -        long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);

     

       24
       24
       -
       +        long long __ll = strtoll(__a, &__p2, __base);

     

       25
       25
       -
                typename remove_reference<decltype(errno)>::type __current_errno = errno;

     

       26
       26
       -
                if (__current_errno == 0)

     

       27
       27
       -
                    errno = __save_errno;

     

       28
       28
       -
       @@ -735,7 +735,7 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end,

     

       29
       29
       -
                typename remove_reference<decltype(errno)>::type __save_errno = errno;

     

       30
       30
       -
                errno = 0;

     

       31
       31
       -
                char *__p2;

     

       32
       32
       -
       -        unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);

     

       33
       33
       -
       +        unsigned long long __ll = strtoull(__a, &__p2, __base);

     

       34
       34
       -
                typename remove_reference<decltype(errno)>::type __current_errno = errno;

     

       35
       35
       -
                if (__current_errno == 0)

     

       36
       36
       -
                    errno = __save_errno;

     

       37
       37
       -
       -- 

     

       38
       38
       -
       1.7.1

     

       39
       39
       -

-16

pkgs/development/compilers/llvm/common/libcxxabi/wasm.patch

···

       1
       1
       -
       diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake

     

       2
       2
       -
       index 15497d405e0..33f7f18193a 100644

     

       3
       3
       -
       --- a/cmake/modules/HandleLLVMOptions.cmake

     

       4
       4
       -
       +++ b/cmake/modules/HandleLLVMOptions.cmake

     

       5
       5
       -
       @@ -127,7 +127,10 @@ else(WIN32)

     

       6
       6
       -
              set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)

     

       7
       7
       -
            endif()

     

       8
       8
       -
          else(FUCHSIA OR UNIX)

     

       9
       9
       -
       -    MESSAGE(SEND_ERROR "Unable to determine platform")

     

       10
       10
       -
       +    if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")

     

       11
       11
       -
       +    else()

     

       12
       12
       -
       +      MESSAGE(SEND_ERROR "Unable to determine platform")

     

       13
       13
       -
       +    endif()

     

       14
       14
       -
          endif(FUCHSIA OR UNIX)

     

       15
       15
       -
        endif(WIN32)

     

       16
       16
       -

+65 -102

pkgs/development/compilers/llvm/common/libunwind/default.nix

···

       16
       16
        
         devExtraCmakeFlags ? [ ],

     

       17
       17
        
         getVersionFile,

     

       18
       18
        
       }:

     

       19
       19
       -
       stdenv.mkDerivation (

     

       20
       20
       -
         finalAttrs:

     

       21
       21
       -
         let

     

       22
       22
       -
           hasPatches = builtins.length finalAttrs.patches > 0;

     

       23
       23
       -
         in

     

       24
       24
       -
         {

     

       25
       25
       -
           pname = "libunwind";

     

       19
       19
       +
       stdenv.mkDerivation (finalAttrs: {

     

       20
       20
       +
         pname = "libunwind";

     

       26
       21
        
       

     

       27
       27
       -
           inherit version;

     

       22
       22
       +
         inherit version;

     

       28
       23
        
       

     

       29
       29
       -
           patches = lib.optional (lib.versionOlder release_version "17") (

     

       30
       30
       -
             getVersionFile "libunwind/gnu-install-dirs.patch"

     

       31
       31
       -
           );

     

       24
       24
       +
         # TODO: Remove on `staging`.

     

       25
       25
       +
         patches = [ ];

     

       32
       26
        
       

     

       33
       33
       -
           src =

     

       34
       34
       -
             if monorepoSrc != null then

     

       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
       40
       -
                   cp -r ${monorepoSrc}/cmake "$out"

     

       41
       41
       -
                 ''

     

       42
       42
       -
                 + ''

     

       43
       43
       -
                   cp -r ${monorepoSrc}/libunwind "$out"

     

       44
       44
       -
                   mkdir -p "$out/libcxx"

     

       45
       45
       -
                   cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx"

     

       46
       46
       -
                   cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx"

     

       47
       47
       -
                   mkdir -p "$out/llvm"

     

       48
       48
       -
                   cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"

     

       49
       49
       -
                 ''

     

       50
       50
       -
                 + lib.optionalString (lib.versionAtLeast release_version "15") ''

     

       51
       51
       -
                   cp -r ${monorepoSrc}/llvm/utils "$out/llvm"

     

       52
       52
       -
                   cp -r ${monorepoSrc}/runtimes "$out"

     

       53
       53
       -
                 ''

     

       54
       54
       -
               )

     

       55
       55
       -
             else

     

       56
       56
       -
               src;

     

       27
       27
       +
         src =

     

       28
       28
       +
           if monorepoSrc != null then

     

       29
       29
       +
             runCommand "libunwind-src-${version}" { inherit (monorepoSrc) passthru; } ''

     

       30
       30
       +
               mkdir -p "$out"

     

       31
       31
       +
               cp -r ${monorepoSrc}/cmake "$out"

     

       32
       32
       +
               cp -r ${monorepoSrc}/libunwind "$out"

     

       33
       33
       +
               mkdir -p "$out/libcxx"

     

       34
       34
       +
               cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx"

     

       35
       35
       +
               cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx"

     

       36
       36
       +
               mkdir -p "$out/llvm"

     

       37
       37
       +
               cp -r ${monorepoSrc}/llvm/cmake "$out/llvm"

     

       38
       38
       +
               cp -r ${monorepoSrc}/llvm/utils "$out/llvm"

     

       39
       39
       +
               cp -r ${monorepoSrc}/runtimes "$out"

     

       40
       40
       +
             ''

     

       41
       41
       +
           else

     

       42
       42
       +
             src;

     

       57
       43
        
       

     

       58
       58
       -
           sourceRoot =

     

       59
       59
       -
             if lib.versionAtLeast release_version "15" then

     

       60
       60
       -
               "${finalAttrs.src.name}/runtimes"

     

       61
       61
       -
             else

     

       62
       62
       -
               "${finalAttrs.src.name}/libunwind";

     

       44
       44
       +
         sourceRoot = "${finalAttrs.src.name}/runtimes";

     

       63
       45
        
       

     

       64
       64
       -
           outputs = [

     

       65
       65
       -
             "out"

     

       66
       66
       -
             "dev"

     

       67
       67
       -
           ];

     

       46
       46
       +
         outputs = [

     

       47
       47
       +
           "out"

     

       48
       48
       +
           "dev"

     

       49
       49
       +
         ];

     

       68
       50
        
       

     

       69
       69
       -
           nativeBuildInputs = [

     

       70
       70
       -
             cmake

     

       71
       71
       -
           ]

     

       72
       72
       -
           ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       73
       73
       -
             ninja

     

       74
       74
       -
             python3

     

       75
       75
       -
           ];

     

       51
       51
       +
         nativeBuildInputs = [

     

       52
       52
       +
           cmake

     

       53
       53
       +
           ninja

     

       54
       54
       +
           python3

     

       55
       55
       +
         ];

     

       76
       56
        
       

     

       77
       77
       -
           cmakeFlags = [

     

       78
       78
       -
             (lib.cmakeBool "LIBUNWIND_ENABLE_SHARED" enableShared)

     

       79
       79
       -
           ]

     

       80
       80
       -
           ++ lib.optional (lib.versionAtLeast release_version "15") (

     

       81
       81
       -
             lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind"

     

       82
       82
       -
           )

     

       83
       83
       -
           ++ lib.optionals (lib.versions.major release_version == "12" && stdenv.hostPlatform.isDarwin) [

     

       84
       84
       -
             (lib.cmakeBool "CMAKE_CXX_COMPILER_WORKS" true)

     

       85
       85
       -
           ]

     

       86
       86
       -
           ++ devExtraCmakeFlags;

     

       87
       87
       -
       

     

       88
       88
       -
           prePatch =

     

       89
       89
       -
             lib.optionalString

     

       90
       90
       -
               (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18"))

     

       91
       91
       -
               ''

     

       92
       92
       -
                 cd ../libunwind

     

       93
       93
       -
                 chmod -R u+w .

     

       94
       94
       -
               '';

     

       57
       57
       +
         cmakeFlags = [

     

       58
       58
       +
           (lib.cmakeBool "LIBUNWIND_ENABLE_SHARED" enableShared)

     

       59
       59
       +
           (lib.cmakeFeature "LLVM_ENABLE_RUNTIMES" "libunwind")

     

       60
       60
       +
         ]

     

       61
       61
       +
         ++ devExtraCmakeFlags;

     

       95
       62
        
       

     

       96
       96
       -
           postPatch =

     

       97
       97
       -
             lib.optionalString

     

       98
       98
       -
               (lib.versionAtLeast release_version "15" && (hasPatches || lib.versionOlder release_version "18"))

     

       99
       99
       -
               ''

     

       100
       100
       -
                 cd ../runtimes

     

       101
       101
       -
               '';

     

       63
       63
       +
         # TODO: Remove on `staging`.

     

       64
       64
       +
         prePatch = "";

     

       65
       65
       +
         postPatch = "";

     

       102
       66
        
       

     

       103
       103
       -
           postInstall =

     

       104
       104
       -
             lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows)

     

       105
       105
       -
               ''

     

       106
       106
       -
                 # libcxxabi wants to link to libunwind_shared.so (?).

     

       107
       107
       -
                 ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so

     

       108
       108
       -
               ''

     

       109
       109
       -
             + lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) ''

     

       110
       110
       -
               ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a

     

       67
       67
       +
         postInstall =

     

       68
       68
       +
           lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows)

     

       111
       69
        
             ''

     

       112
       112
       -
             + lib.optionalString (doFakeLibgcc && !stdenv.hostPlatform.isWindows) ''

     

       113
       113
       -
               ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so

     

       114
       114
       -
               ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1

     

       70
       70
       +
               # libcxxabi wants to link to libunwind_shared.so (?).

     

       71
       71
       +
               ln -s $out/lib/libunwind.so $out/lib/libunwind_shared.so

     

       115
       72
        
             ''

     

       116
       116
       -
             + lib.optionalString (doFakeLibgcc && stdenv.hostPlatform.isWindows) ''

     

       117
       117
       -
               ln -s $out/lib/libunwind.dll.a $out/lib/libgcc_s.dll.a

     

       118
       118
       -
             '';

     

       73
       73
       +
           + lib.optionalString (enableShared && stdenv.hostPlatform.isWindows) ''

     

       74
       74
       +
             ln -s $out/lib/libunwind.dll.a $out/lib/libunwind_shared.dll.a

     

       75
       75
       +
           ''

     

       76
       76
       +
           + lib.optionalString (doFakeLibgcc && !stdenv.hostPlatform.isWindows) ''

     

       77
       77
       +
             ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so

     

       78
       78
       +
             ln -s $out/lib/libunwind.so $out/lib/libgcc_s.so.1

     

       79
       79
       +
           ''

     

       80
       80
       +
           + lib.optionalString (doFakeLibgcc && stdenv.hostPlatform.isWindows) ''

     

       81
       81
       +
             ln -s $out/lib/libunwind.dll.a $out/lib/libgcc_s.dll.a

     

       82
       82
       +
           '';

     

       119
       83
        
       

     

       120
       120
       -
           meta = llvm_meta // {

     

       121
       121
       -
             # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst

     

       122
       122
       -
             homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library";

     

       123
       123
       -
             description = "LLVM's unwinder library";

     

       124
       124
       -
             longDescription = ''

     

       125
       125
       -
               The unwind library provides a family of _Unwind_* functions implementing

     

       126
       126
       -
               the language-neutral stack unwinding portion of the Itanium C++ ABI (Level

     

       127
       127
       -
               I). It is a dependency of the C++ ABI library, and sometimes is a

     

       128
       128
       -
               dependency of other runtimes.

     

       129
       129
       -
             '';

     

       130
       130
       -
           };

     

       131
       131
       -
         }

     

       132
       132
       -
       )

     

       84
       84
       +
         meta = llvm_meta // {

     

       85
       85
       +
           # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst

     

       86
       86
       +
           homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library";

     

       87
       87
       +
           description = "LLVM's unwinder library";

     

       88
       88
       +
           longDescription = ''

     

       89
       89
       +
             The unwind library provides a family of _Unwind_* functions implementing

     

       90
       90
       +
             the language-neutral stack unwinding portion of the Itanium C++ ABI (Level

     

       91
       91
       +
             I). It is a dependency of the C++ ABI library, and sometimes is a

     

       92
       92
       +
             dependency of other runtimes.

     

       93
       93
       +
           '';

     

       94
       94
       +
         };

     

       95
       95
       +
       })

+19 -38

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
        
       

     
···

       44
       38
        
         patches = [

     

       45
       39
        
           (getVersionFile "lld/gnu-install-dirs.patch")

     

       46
       40
        
         ]

     

       47
       47
       -
         ++ lib.optional (lib.versions.major release_version == "14") (

     

       48
       48
       -
           getVersionFile "lld/fix-root-src-dir.patch"

     

       49
       49
       -
         )

     

       50
       50
       -
         ++ lib.optional (lib.versionAtLeast release_version "16" && lib.versionOlder release_version "18") (

     

       51
       51
       -
           getVersionFile "lld/add-table-base.patch"

     

       52
       52
       -
         )

     

       53
       41
        
         ++ lib.optional (lib.versions.major release_version == "18") (

     

       54
       42
        
           # https://github.com/llvm/llvm-project/pull/97122

     

       55
       43
        
           fetchpatch {

     
···

       60
       48
        
           }

     

       61
       49
        
         );

     

       62
       50
        
       

     

       63
       63
       -
         nativeBuildInputs = [ cmake ] ++ lib.optional (lib.versionAtLeast release_version "15") ninja;

     

       51
       51
       +
         nativeBuildInputs = [

     

       52
       52
       +
           cmake

     

       53
       53
       +
           ninja

     

       54
       54
       +
         ];

     

       64
       55
        
         buildInputs = [

     

       65
       56
        
           libllvm

     

       66
       57
        
           libxml2

     

       67
       58
        
         ];

     

       68
       59
        
       

     

       69
       69
       -
         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") [

     

       76
       76
       -
             (lib.cmakeFeature "LLD_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/lld")

     

       77
       77
       -
           ]

     

       78
       78
       -
           ++ [

     

       79
       79
       -
             (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       80
       80
       -
           ]

     

       81
       81
       -
           ++ devExtraCmakeFlags;

     

       60
       60
       +
         cmakeFlags = [

     

       61
       61
       +
           (lib.cmakeFeature "LLD_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/lld")

     

       62
       62
       +
           (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       63
       63
       +
         ]

     

       64
       64
       +
         ++ devExtraCmakeFlags;

     

       82
       65
        
       

     

       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
       -
         '';

     

       66
       66
       +
         # TODO: Remove on `staging`.

     

       67
       67
       +
         postPatch = "";

     

       87
       68
        
       

     

       88
       69
        
         # Musl's default stack size is too small for lld to be able to link Firefox.

     

       89
       70
        
         LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";

+24 -98

pkgs/development/compilers/llvm/common/lldb/default.nix

···

       32
       32
        
       

     

       33
       33
        
       let

     

       34
       34
        
         vscodeExt = {

     

       35
       35
       -
           name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";

     

       36
       36
       -
           version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";

     

       35
       35
       +
           name = "lldb-dap";

     

       36
       36
       +
           version = "0.2.0";

     

       37
       37
        
         };

     

       38
       38
        
       in

     

       39
       39
        
       

     
···

       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) ''

     
···

       72
       68
        
             "dev"

     

       73
       69
        
           ];

     

       74
       70
        
       

     

       75
       75
       -
           sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${finalAttrs.src.name}/lldb";

     

       71
       71
       +
           sourceRoot = "${finalAttrs.src.name}/lldb";

     

       76
       72
        
       

     

       77
       77
       -
           patches =

     

       78
       78
       -
             let

     

       79
       79
       -
               resourceDirPatch =

     

       80
       80
       -
                 (replaceVars (getVersionFile "lldb/resource-dir.patch") {

     

       81
       81
       -
                   clangLibDir = "${lib.getLib libclang}/lib";

     

       82
       82
       -
                 }).overrideAttrs

     

       83
       83
       -
                   (_: _: { name = "resource-dir.patch"; });

     

       84
       84
       -
             in

     

       85
       85
       -
             lib.optionals (lib.versionOlder release_version "15") [

     

       86
       86
       -
               # Fixes for SWIG 4

     

       87
       87
       -
               (fetchpatch2 {

     

       88
       88
       -
                 url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";

     

       89
       89
       -
                 stripLen = 1;

     

       90
       90
       -
                 hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";

     

       91
       91
       -
               })

     

       92
       92
       -
               (fetchpatch2 {

     

       93
       93
       -
                 url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";

     

       94
       94
       -
                 stripLen = 1;

     

       95
       95
       -
                 hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";

     

       96
       96
       -
               })

     

       97
       97
       -
             ]

     

       98
       98
       -
             ++ lib.optionals (lib.versionOlder release_version "16") [

     

       99
       99
       -
               # Fixes for SWIG 4

     

       100
       100
       -
               (fetchpatch2 {

     

       101
       101
       -
                 url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";

     

       102
       102
       -
                 stripLen = 1;

     

       103
       103
       -
                 hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";

     

       104
       104
       -
               })

     

       105
       105
       -
               (fetchpatch2 {

     

       106
       106
       -
                 url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";

     

       107
       107
       -
                 stripLen = 1;

     

       108
       108
       -
                 hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";

     

       109
       109
       -
               })

     

       110
       110
       -
       

     

       111
       111
       -
               # FIXME: do we need this after 15?

     

       112
       112
       -
               (getVersionFile "lldb/procfs.patch")

     

       113
       113
       -
             ]

     

       114
       114
       -
             ++ lib.optional (lib.versionOlder release_version "18") (fetchpatch {

     

       115
       115
       -
               name = "libcxx-19-char_traits.patch";

     

       116
       116
       -
               url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch";

     

       117
       117
       -
               stripLen = 1;

     

       118
       118
       -
               hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc=";

     

       119
       119
       -
             })

     

       120
       120
       -
             ++ lib.optionals (lib.versionOlder release_version "17") [

     

       121
       121
       -
               resourceDirPatch

     

       122
       122
       -
               (fetchpatch {

     

       123
       123
       -
                 name = "add-cstdio.patch";

     

       124
       124
       -
                 url = "https://github.com/llvm/llvm-project/commit/73e15b5edb4fa4a77e68c299a6e3b21e610d351f.patch";

     

       125
       125
       -
                 stripLen = 1;

     

       126
       126
       -
                 hash = "sha256-eFcvxZaAuBsY/bda1h9212QevrXyvCHw8Cr9ngetDr0=";

     

       127
       127
       -
               })

     

       128
       128
       -
             ]

     

       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;

     

       73
       73
       +
           patches = [ ./gnu-install-dirs.patch ];

     

       133
       74
        
       

     

       134
       75
        
           nativeBuildInputs = [

     

       135
       76
        
             cmake

     
···

       142
       83
        
           ]

     

       143
       84
        
           ++ lib.optionals enableManpages [

     

       144
       85
        
             python3.pkgs.sphinx

     

       145
       145
       -
           ]

     

       146
       146
       -
           ++ lib.optionals (lib.versionOlder release_version "18" && enableManpages) [

     

       147
       147
       -
             python3.pkgs.recommonmark

     

       148
       148
       -
           ]

     

       149
       149
       -
           ++ lib.optionals (lib.versionAtLeast release_version "18" && enableManpages) [

     

       150
       86
        
             python3.pkgs.myst-parser

     

       151
       87
        
           ]

     

       152
       152
       -
           ++ lib.optionals (lib.versionAtLeast release_version "14") [

     

       88
       88
       +
           # TODO: Clean up on `staging`.

     

       89
       89
       +
           ++ [

     

       153
       90
        
             ninja

     

       154
       91
        
           ];

     

       155
       92
        
       

     
···

       159
       96
        
             libedit

     

       160
       97
        
             libxml2

     

       161
       98
        
             libllvm

     

       162
       162
       -
           ]

     

       163
       163
       -
           ++ lib.optionals (lib.versionAtLeast release_version "16") [

     

       164
       99
        
             # Starting with LLVM 16, the resource dir patch is no longer enough to get

     

       165
       100
        
             # libclang into the rpath of the lldb executables. By putting it into

     

       166
       101
        
             # buildInputs cc-wrapper will set up rpath correctly for us.

     
···

       184
       119
        
           ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

     

       185
       120
        
             (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic

     

       186
       121
        
           ]

     

       187
       187
       -
           ++ lib.optionals (lib.versionAtLeast release_version "17") [

     

       122
       122
       +
           # TODO: Clean up on `staging`.

     

       123
       123
       +
           ++ [

     

       188
       124
        
             (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")

     

       189
       125
        
           ]

     

       190
       190
       -
           ++ lib.optionals enableManpages (

     

       191
       191
       -
             [

     

       192
       192
       -
               (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)

     

       193
       193
       -
               (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)

     

       194
       194
       -
               (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)

     

       195
       195
       -
             ]

     

       196
       196
       -
             ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       197
       197
       -
               # docs reference `automodapi` but it's not added to the extensions list when

     

       198
       198
       -
               # only building the manpages:

     

       199
       199
       -
               # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54

     

       200
       200
       -
               #

     

       201
       201
       -
               # so, we just ignore the resulting errors

     

       202
       202
       -
               (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)

     

       203
       203
       -
             ]

     

       204
       204
       -
           )

     

       126
       126
       +
           ++ lib.optionals enableManpages [

     

       127
       127
       +
             (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)

     

       128
       128
       +
             (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)

     

       129
       129
       +
             (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)

     

       130
       130
       +
             # docs reference `automodapi` but it's not added to the extensions list when

     

       131
       131
       +
             # only building the manpages:

     

       132
       132
       +
             # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54

     

       133
       133
       +
             #

     

       134
       134
       +
             # so, we just ignore the resulting errors

     

       135
       135
       +
             (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)

     

       136
       136
       +
           ]

     

       205
       137
        
           ++ lib.optionals finalAttrs.finalPackage.doCheck [

     

       206
       138
        
             (lib.cmakeFeature "LLDB_TEST_C_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc")

     

       207
       139
        
             (lib.cmakeFeature "-DLLDB_TEST_CXX_COMPILER" "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++")

     
···

       209
       141
        
           ++ devExtraCmakeFlags;

     

       210
       142
        
       

     

       211
       143
        
           doCheck = false;

     

       212
       212
       -
           doInstallCheck = lib.versionOlder release_version "15";

     

       144
       144
       +
           doInstallCheck = false;

     

       213
       145
        
       

     

       214
       146
        
           # TODO: cleanup with mass-rebuild

     

       215
       147
        
           installCheckPhase = ''

     
···

       217
       149
        
                 echo "ERROR: python files not installed where expected!";

     

       218
       150
        
                 return 1;

     

       219
       151
        
             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
       152
        
             if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then

     

       223
       153
        
                 echo "ERROR: lua files not installed where expected!";

     

       224
       154
        
                 return 1;

     
···

       232
       162
        
             # vscode:

     

       233
       163
        
             install -D ../tools/${vscodeExt.name}/package.json $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/package.json

     

       234
       164
        
             mkdir -p $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       235
       235
       -
             ln -s $out/bin/*${

     

       236
       236
       -
               if lib.versionAtLeast release_version "18" then vscodeExt.name else "-vscode"

     

       237
       237
       -
             } $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       165
       165
       +
             ln -s $out/bin/*${vscodeExt.name} $out/share/vscode/extensions/llvm-org.${vscodeExt.name}-${vscodeExt.version}/bin

     

       238
       166
        
           '';

     

       239
       167
        
       

     

       240
       168
        
           passthru.vscodeExtName = vscodeExt.name;

     
···

       250
       178
        
               larger LLVM Project, such as the Clang expression parser and LLVM

     

       251
       179
        
               disassembler.

     

       252
       180
        
             '';

     

       253
       253
       -
             broken = lib.versionOlder release_version "14";

     

       254
       181
        
             mainProgram = "lldb";

     

       255
       182
        
           };

     

       256
       183
        
         }

     

       257
       184
        
         // lib.optionalAttrs enableManpages {

     

       258
       185
        
           pname = "lldb-manpages";

     

       259
       186
        
       

     

       260
       260
       -
           buildPhase = lib.optionalString (lib.versionOlder release_version "15") ''

     

       261
       261
       -
             make ${if (lib.versionOlder release_version "12") then "docs-man" else "docs-lldb-man"}

     

       262
       262
       -
           '';

     

       187
       187
       +
           # TODO: Remove on `staging`.

     

       188
       188
       +
           buildPhase = "";

     

       263
       189
        
       

     

       264
       264
       -
           ninjaFlags = lib.optionals (lib.versionAtLeast release_version "15") [ "docs-lldb-man" ];

     

       190
       190
       +
           ninjaFlags = [ "docs-lldb-man" ];

     

       265
       191
        
       

     

       266
       192
        
           propagatedBuildInputs = [ ];

     

       267
       193

+162 -395

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,

     
···

       83
       83
        
           pname = "llvm";

     

       84
       84
        
           inherit version;

     

       85
       85
        
       

     

       86
       86
       -
           # Used when creating a version-suffixed symlink of libLLVM.dylib

     

       86
       86
       +
           # TODO: Remove on `staging`.

     

       87
       87
        
           shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version));

     

       88
       88
        
       

     

       89
       89
        
           src =

     
···

       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
       132
       -
             ++ lib.optionals (lib.versions.major release_version == "12") [

     

       133
       133
       -
               # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955

     

       134
       134
       -
               (getVersionFile "llvm/fix-llvm-issue-49955.patch")

     

       135
       135
       -
       

     

       136
       136
       -
               # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test.

     

       137
       137
       -
               (fetchpatch {

     

       138
       138
       -
                 name = "uops-CMOV16rm-noreg.diff";

     

       139
       139
       -
                 url = "https://github.com/llvm/llvm-project/commit/9e9f991ac033.diff";

     

       140
       140
       -
                 sha256 = "sha256:12s8vr6ibri8b48h2z38f3afhwam10arfiqfy4yg37bmc054p5hi";

     

       141
       141
       -
                 stripLen = 1;

     

       142
       142
       -
               })

     

       143
       143
       -
             ]

     

       144
       124
        
             # Support custom installation dirs

     

       145
       125
        
             # Originally based off https://reviews.llvm.org/D99484

     

       146
       126
        
             # Latest state: https://github.com/llvm/llvm-project/pull/125376

     

       147
       147
       -
             ++ [ (getVersionFile "llvm/gnu-install-dirs.patch") ]

     

       148
       148
       -
             ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       127
       127
       +
             [ (getVersionFile "llvm/gnu-install-dirs.patch") ]

     

       128
       128
       +
             ++ [

     

       149
       129
        
               # Running the tests involves invoking binaries (like `opt`) that depend on

     

       150
       130
        
               # the LLVM dylibs and reference them by absolute install path (i.e. their

     

       151
       131
        
               # nix store path).

     
···

       188
       168
        
               (getVersionFile "llvm/lit-shell-script-runner-set-dyld-library-path.patch")

     

       189
       169
        
             ]

     

       190
       170
        
             ++

     

       191
       191
       -
               lib.optional (lib.versions.major release_version == "13")

     

       192
       192
       -
                 # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611

     

       193
       193
       -
                 (

     

       194
       194
       -
                   fetchpatch {

     

       195
       195
       -
                     url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch";

     

       196
       196
       -
                     sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g";

     

       197
       197
       -
                     stripLen = 1;

     

       198
       198
       -
                   }

     

       199
       199
       -
                 )

     

       200
       200
       -
             ++

     

       201
       201
       -
               lib.optional (lib.versionAtLeast release_version "12" && lib.versionOlder release_version "19")

     

       171
       171
       +
               lib.optional (lib.versionOlder release_version "19")

     

       202
       172
        
                 # Add missing include headers to build against gcc-15:

     

       203
       173
        
                 #   https://github.com/llvm/llvm-project/pull/101761

     

       204
       174
        
                 (

     
···

       208
       178
        
                     stripLen = 1;

     

       209
       179
        
                   }

     

       210
       180
        
                 )

     

       211
       211
       -
             ++ lib.optionals (lib.versionOlder release_version "16") [

     

       212
       212
       -
               # Fix musl build.

     

       213
       213
       -
               (fetchpatch {

     

       214
       214
       -
                 url = "https://github.com/llvm/llvm-project/commit/5cd554303ead0f8891eee3cd6d25cb07f5a7bf67.patch";

     

       215
       215
       -
                 relative = "llvm";

     

       216
       216
       -
                 hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA=";

     

       217
       217
       -
               })

     

       218
       218
       -
               # Fix for Python 3.13

     

       219
       219
       -
               (getVersionFile "llvm/no-pipes.patch")

     

       220
       220
       -
             ]

     

       221
       221
       -
             ++ lib.optionals (lib.versionOlder release_version "14") [

     

       222
       222
       -
               # Backport gcc-13 fixes with missing includes.

     

       223
       223
       -
               (fetchpatch {

     

       224
       224
       -
                 name = "signals-gcc-13.patch";

     

       225
       225
       -
                 url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch";

     

       226
       226
       -
                 hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs=";

     

       227
       227
       -
                 stripLen = 1;

     

       228
       228
       -
               })

     

       229
       229
       -
               (fetchpatch {

     

       230
       230
       -
                 name = "base64-gcc-13.patch";

     

       231
       231
       -
                 url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch";

     

       232
       232
       -
                 hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U=";

     

       233
       233
       -
                 stripLen = 1;

     

       234
       234
       -
               })

     

       235
       235
       -
             ]

     

       236
       236
       -
             ++

     

       237
       237
       -
               lib.optionals

     

       238
       238
       -
                 (

     

       239
       239
       -
                   (lib.versionAtLeast (lib.versions.major release_version) "14")

     

       240
       240
       -
                   && (lib.versionOlder (lib.versions.major release_version) "17")

     

       241
       241
       -
                 )

     

       242
       242
       -
                 [

     

       243
       243
       -
                   # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests)

     

       244
       244
       -
                   # See also: https://github.com/numba/numba/issues/9109

     

       245
       245
       -
                   (fetchpatch {

     

       246
       246
       -
                     url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch";

     

       247
       247
       -
                     relative = "llvm";

     

       248
       248
       -
                     hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA=";

     

       249
       249
       -
                   })

     

       250
       250
       -
                 ]

     

       251
       251
       -
             ++

     

       252
       252
       -
               lib.optional (lib.versions.major release_version == "17")

     

       253
       253
       -
                 # Fixes a crash with -fzero-call-used-regs=used-gpr

     

       254
       254
       -
                 # See also https://github.com/llvm/llvm-project/issues/75168

     

       255
       255
       -
                 (

     

       256
       256
       -
                   fetchpatch {

     

       257
       257
       -
                     name = "fix-fzero-call-used-regs.patch";

     

       258
       258
       -
                     url = "https://github.com/llvm/llvm-project/commit/f800c1f3b207e7bcdc8b4c7192928d9a078242a0.patch";

     

       259
       259
       -
                     stripLen = 1;

     

       260
       260
       -
                     hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8=";

     

       261
       261
       -
                   }

     

       262
       262
       -
                 )

     

       263
       181
        
             ++ lib.optionals (lib.versions.major release_version == "18") [

     

       264
       182
        
               # Reorgs one test so the next patch applies

     

       265
       183
        
               (fetchpatch {

     
···

       277
       195
        
                 hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";

     

       278
       196
        
               })

     

       279
       197
        
             ]

     

       280
       280
       -
             ++

     

       281
       281
       -
               lib.optionals (lib.versionAtLeast release_version "17" && lib.versionOlder release_version "19")

     

       282
       282
       -
                 [

     

       283
       283
       -
                   # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804)

     

       284
       284
       -
                   (fetchpatch {

     

       285
       285
       -
                     url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch";

     

       286
       286
       -
                     hash = "sha256-mvBlG2RxpZPFnPI7jvCMz+Fc8JuM15Ye3th1FVZMizE=";

     

       287
       287
       -
                     stripLen = 1;

     

       288
       288
       -
                   })

     

       289
       289
       -
                 ]

     

       198
       198
       +
             ++ lib.optionals (lib.versionOlder release_version "19") [

     

       199
       199
       +
               # Fixes test-suite on glibc 2.40 (https://github.com/llvm/llvm-project/pull/100804)

     

       200
       200
       +
               (fetchpatch {

     

       201
       201
       +
                 url = "https://github.com/llvm/llvm-project/commit/1e8df9e85a1ff213e5868bd822877695f27504ad.patch";

     

       202
       202
       +
                 hash = "sha256-mvBlG2RxpZPFnPI7jvCMz+Fc8JuM15Ye3th1FVZMizE=";

     

       203
       203
       +
                 stripLen = 1;

     

       204
       204
       +
               })

     

       205
       205
       +
             ]

     

       290
       206
        
             ++ lib.optionals enablePolly [

     

       291
       207
        
               # Just like the `gnu-install-dirs` patch, but for `polly`.

     

       292
       208
        
               (getVersionFile "llvm/gnu-install-dirs-polly.patch")

     

       293
       209
        
             ]

     

       294
       294
       -
             ++

     

       295
       295
       -
               lib.optional (lib.versionAtLeast release_version "15")

     

       296
       296
       -
                 # Just like the `llvm-lit-cfg` patch, but for `polly`.

     

       297
       297
       -
                 (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")

     

       210
       210
       +
             ++ [

     

       211
       211
       +
               # Just like the `llvm-lit-cfg` patch, but for `polly`.

     

       212
       212
       +
               (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch")

     

       213
       213
       +
             ]

     

       298
       214
        
             ++

     

       299
       215
        
               lib.optional (lib.versions.major release_version == "20")

     

       300
       216
        
                 # Test failure on riscv64, fixed in llvm 21

     
···

       313
       229
        
             # this is needed until scripts are updated to not use /usr/bin/uname on FreeBSD native

     

       314
       230
        
             updateAutotoolsGnuConfigScriptsHook

     

       315
       231
        
             python

     

       232
       232
       +
             ninja

     

       316
       233
        
           ]

     

       317
       317
       -
           ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)

     

       318
       234
        
           ++ optionals enableManpages [

     

       319
       235
        
             # Note: we intentionally use `python3Packages` instead of `python3.pkgs`;

     

       320
       236
        
             # splicing does *not* work with the latter. (TODO: fix)

     

       321
       237
        
             python3Packages.sphinx

     

       322
       322
       -
           ]

     

       323
       323
       -
           ++ optionals (lib.versionOlder version "18" && enableManpages) [

     

       324
       324
       -
             python3Packages.recommonmark

     

       325
       325
       -
           ]

     

       326
       326
       -
           ++ optionals (lib.versionAtLeast version "18" && enableManpages) [

     

       327
       238
        
             python3Packages.myst-parser

     

       328
       239
        
           ];

     

       329
       240
        
       

     
···

       333
       244
        
           ]

     

       334
       245
        
           ++ optional enablePFM libpfm; # exegesis

     

       335
       246
        
       

     

       336
       336
       -
           propagatedBuildInputs =

     

       337
       337
       -
             (lib.optional (

     

       338
       338
       -
               lib.versionAtLeast release_version "14" || stdenv.buildPlatform == stdenv.hostPlatform

     

       339
       339
       -
             ) ncurses)

     

       340
       340
       -
             ++ [ zlib ];

     

       247
       247
       +
           propagatedBuildInputs = [

     

       248
       248
       +
             ncurses

     

       249
       249
       +
             zlib

     

       250
       250
       +
           ];

     

       251
       251
       +
       

     

       252
       252
       +
           nativeCheckInputs = [

     

       253
       253
       +
             which

     

       254
       254
       +
           ]

     

       255
       255
       +
           ++ lib.optional stdenv.hostPlatform.isDarwin sysctl;

     

       341
       256
        
       

     

       342
       257
        
           postPatch =

     

       343
       258
        
             optionalString stdenv.hostPlatform.isDarwin (

     
···

       348
       263
        
               +

     

       349
       264
        
                 # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick

     

       350
       265
        
                 # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7

     

       351
       351
       -
                 (optionalString (lib.versionAtLeast release_version "15") (

     

       352
       352
       -
                   ''

     

       353
       353
       -
                     rm test/MC/ELF/cfi-version.ll

     

       266
       266
       +
                 ''

     

       267
       267
       +
                   rm test/MC/ELF/cfi-version.ll

     

       354
       268
        
       

     

       269
       269
       +
                 ''

     

       270
       270
       +
               +

     

       271
       271
       +
                 # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)

     

       272
       272
       +
                 # and thus fails under the sandbox:

     

       273
       273
       +
                 ''

     

       274
       274
       +
                   substituteInPlace unittests/TargetParser/Host.cpp \

     

       275
       275
       +
                     --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       276
       276
       +
                 ''

     

       277
       277
       +
               +

     

       278
       278
       +
                 # This test tries to call the intrinsics `@llvm.roundeven.f32` and

     

       279
       279
       +
                 # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`

     

       280
       280
       +
                 # and `roundeven` on macOS and FreeBSD.

     

       281
       281
       +
                 #

     

       282
       282
       +
                 # However these functions are glibc specific so the test fails:

     

       283
       283
       +
                 #   - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html

     

       284
       284
       +
                 #   - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html

     

       285
       285
       +
                 #

     

       286
       286
       +
                 # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it

     

       287
       287
       +
                 # pass there?

     

       288
       288
       +
                 ''

     

       289
       289
       +
                   substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \

     

       290
       290
       +
                     --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \

     

       291
       291
       +
                     --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""

     

       292
       292
       +
                 ''

     

       293
       293
       +
               +

     

       294
       294
       +
                 # fails when run in sandbox

     

       295
       295
       +
                 optionalString (!stdenv.hostPlatform.isx86) ''

     

       296
       296
       +
                   substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       297
       297
       +
                     --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       298
       298
       +
                 ''

     

       299
       299
       +
             )

     

       300
       300
       +
             +

     

       301
       301
       +
               # dup of above patch with different conditions

     

       302
       302
       +
               optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86) (

     

       303
       303
       +
                 # fails when run in sandbox

     

       304
       304
       +
                 (

     

       305
       305
       +
                   ''

     

       306
       306
       +
                     substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       307
       307
       +
                       --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       355
       308
        
                   ''

     

       356
       309
        
                   +

     

       357
       357
       -
                     # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)

     

       358
       358
       -
                     # and thus fails under the sandbox:

     

       359
       359
       -
                     (

     

       360
       360
       -
                       if lib.versionAtLeast release_version "16" then

     

       361
       361
       -
                         ''

     

       362
       362
       -
                           substituteInPlace unittests/TargetParser/Host.cpp \

     

       363
       363
       -
                             --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       364
       364
       -
                         ''

     

       365
       365
       -
                       else

     

       366
       366
       -
                         ''

     

       367
       367
       -
                           substituteInPlace unittests/Support/Host.cpp \

     

       368
       368
       -
                             --replace-fail '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers"}"

     

       369
       369
       -
                         ''

     

       370
       370
       -
                     )

     

       371
       371
       -
                   +

     

       372
       372
       -
                     # This test tries to call the intrinsics `@llvm.roundeven.f32` and

     

       373
       373
       -
                     # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`

     

       374
       374
       -
                     # and `roundeven` on macOS and FreeBSD.

     

       310
       310
       +
                     # This test fails on darwin x86_64 because `sw_vers` reports a different

     

       311
       311
       +
                     # macOS version than what LLVM finds by reading

     

       312
       312
       +
                     # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into

     

       313
       313
       +
                     # the sandbox on macOS).

     

       314
       314
       +
                     #

     

       315
       315
       +
                     # The `sw_vers` provided by nixpkgs reports the macOS version associated

     

       316
       316
       +
                     # with the `CoreFoundation` framework with which it was built. Because

     

       317
       317
       +
                     # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what

     

       318
       318
       +
                     # `sw_vers` reports is not guaranteed to match the macOS version of the host

     

       319
       319
       +
                     # that's building this derivation.

     

       320
       320
       +
                     #

     

       321
       321
       +
                     # Astute readers will note that we only _patch_ this test on aarch64-darwin

     

       322
       322
       +
                     # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright.

     

       323
       323
       +
                     # So why does this test pass on aarch64?

     

       324
       324
       +
                     #

     

       325
       325
       +
                     # Well, it seems that `sw_vers` on aarch64 actually links against the _host_

     

       326
       326
       +
                     # CoreFoundation framework instead of the nixpkgs provided one.

     

       375
       327
        
                     #

     

       376
       376
       -
                     # However these functions are glibc specific so the test fails:

     

       377
       377
       -
                     #   - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html

     

       378
       378
       -
                     #   - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html

     

       328
       328
       +
                     # Not entirely sure what the right fix is here. I'm assuming aarch64

     

       329
       329
       +
                     # `sw_vers` doesn't intentionally link against the host `CoreFoundation`

     

       330
       330
       +
                     # (still digging into how this ends up happening, will follow up) but that

     

       331
       331
       +
                     # aside I think the more pertinent question is: should we be patching LLVM's

     

       332
       332
       +
                     # macOS version detection logic to use `sw_vers` instead of reading host

     

       333
       333
       +
                     # paths? This *is* a way in which details about builder machines can creep

     

       334
       334
       +
                     # into the artifacts that are produced, affecting reproducibility, but it's

     

       335
       335
       +
                     # not clear to me when/where/for what this even gets used in LLVM.

     

       379
       336
        
                     #

     

       380
       380
       -
                     # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it

     

       381
       381
       -
                     # pass there?

     

       382
       382
       -
                     optionalString (lib.versionAtLeast release_version "16") ''

     

       383
       383
       -
                       substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \

     

       384
       384
       -
                         --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \

     

       385
       385
       -
                         --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""

     

       337
       337
       +
                     # TODO(@rrbutani): fix/follow-up

     

       338
       338
       +
                     ''

     

       339
       339
       +
                       substituteInPlace unittests/TargetParser/Host.cpp \

     

       340
       340
       +
                         --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       386
       341
        
                     ''

     

       387
       342
        
                   +

     

       388
       388
       -
                     # fails when run in sandbox

     

       389
       389
       -
                     optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") ''

     

       390
       390
       -
                       substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       391
       391
       -
                         --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       343
       343
       +
                     # This test fails with a `dysmutil` crash; have not yet dug into what's

     

       344
       344
       +
                     # going on here (TODO(@rrbutani)).

     

       345
       345
       +
                     lib.optionalString (lib.versionOlder release_version "19") ''

     

       346
       346
       +
                       rm test/tools/dsymutil/ARM/obfuscated.test

     

       392
       347
        
                     ''

     

       393
       393
       -
                 ))

     

       394
       394
       -
             )

     

       395
       395
       -
             +

     

       396
       396
       -
               # dup of above patch with different conditions

     

       397
       397
       -
               optionalString

     

       398
       398
       -
                 (

     

       399
       399
       -
                   stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15"

     

       400
       348
        
                 )

     

       401
       401
       -
                 (

     

       402
       402
       -
                   optionalString (lib.versionOlder release_version "16") ''

     

       403
       403
       -
                     substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \

     

       404
       404
       -
                       --replace-fail "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \

     

       405
       405
       -
                       --replace-fail "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""

     

       406
       406
       -
       

     

       407
       407
       -
                   ''

     

       408
       408
       -
                   +

     

       409
       409
       -
                     # fails when run in sandbox

     

       410
       410
       -
                     (

     

       411
       411
       -
                       (optionalString (lib.versionAtLeast release_version "18") ''

     

       412
       412
       -
                         substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \

     

       413
       413
       -
                           --replace-fail "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"

     

       414
       414
       -
                       '')

     

       415
       415
       -
                       +

     

       416
       416
       -
                         # This test fails on darwin x86_64 because `sw_vers` reports a different

     

       417
       417
       -
                         # macOS version than what LLVM finds by reading

     

       418
       418
       -
                         # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into

     

       419
       419
       -
                         # the sandbox on macOS).

     

       420
       420
       -
                         #

     

       421
       421
       -
                         # The `sw_vers` provided by nixpkgs reports the macOS version associated

     

       422
       422
       -
                         # with the `CoreFoundation` framework with which it was built. Because

     

       423
       423
       -
                         # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what

     

       424
       424
       -
                         # `sw_vers` reports is not guaranteed to match the macOS version of the host

     

       425
       425
       -
                         # that's building this derivation.

     

       426
       426
       -
                         #

     

       427
       427
       -
                         # Astute readers will note that we only _patch_ this test on aarch64-darwin

     

       428
       428
       -
                         # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright.

     

       429
       429
       -
                         # So why does this test pass on aarch64?

     

       430
       430
       -
                         #

     

       431
       431
       -
                         # Well, it seems that `sw_vers` on aarch64 actually links against the _host_

     

       432
       432
       -
                         # CoreFoundation framework instead of the nixpkgs provided one.

     

       433
       433
       -
                         #

     

       434
       434
       -
                         # Not entirely sure what the right fix is here. I'm assuming aarch64

     

       435
       435
       -
                         # `sw_vers` doesn't intentionally link against the host `CoreFoundation`

     

       436
       436
       -
                         # (still digging into how this ends up happening, will follow up) but that

     

       437
       437
       -
                         # aside I think the more pertinent question is: should we be patching LLVM's

     

       438
       438
       -
                         # macOS version detection logic to use `sw_vers` instead of reading host

     

       439
       439
       -
                         # paths? This *is* a way in which details about builder machines can creep

     

       440
       440
       -
                         # into the artifacts that are produced, affecting reproducibility, but it's

     

       441
       441
       -
                         # not clear to me when/where/for what this even gets used in LLVM.

     

       442
       442
       -
                         #

     

       443
       443
       -
                         # TODO(@rrbutani): fix/follow-up

     

       444
       444
       -
                         (

     

       445
       445
       -
                           if lib.versionAtLeast release_version "16" then

     

       446
       446
       -
                             ''

     

       447
       447
       -
                               substituteInPlace unittests/TargetParser/Host.cpp \

     

       448
       448
       -
                                 --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       449
       449
       -
                             ''

     

       450
       450
       -
                           else

     

       451
       451
       -
                             ''

     

       452
       452
       -
                               substituteInPlace unittests/Support/Host.cpp \

     

       453
       453
       -
                                 --replace-fail "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"

     

       454
       454
       -
                             ''

     

       455
       455
       -
                         )

     

       456
       456
       -
                       +

     

       457
       457
       -
                         # This test fails with a `dysmutil` crash; have not yet dug into what's

     

       458
       458
       -
                         # going on here (TODO(@rrbutani)).

     

       459
       459
       -
                         lib.optionalString (lib.versionOlder release_version "19") ''

     

       460
       460
       -
                           rm test/tools/dsymutil/ARM/obfuscated.test

     

       461
       461
       -
                         ''

     

       462
       462
       -
                     )

     

       463
       463
       -
                 )

     

       349
       349
       +
               )

     

       464
       350
        
             +

     

       465
       351
        
               # FileSystem permissions tests fail with various special bits

     

       466
       352
        
               ''

     
···

       470
       356
        
                 substituteInPlace unittests/IR/CMakeLists.txt \

     

       471
       357
        
                   --replace-fail "PassBuilderCallbacksTest.cpp" ""

     

       472
       358
        
                 rm unittests/IR/PassBuilderCallbacksTest.cpp

     

       359
       359
       +
                 rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       473
       360
        
               ''

     

       474
       474
       -
             + lib.optionalString (lib.versionAtLeast release_version "13") ''

     

       475
       475
       -
               rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test

     

       476
       476
       -
             ''

     

       477
       477
       -
             + lib.optionalString (lib.versionOlder release_version "13") ''

     

       478
       478
       -
               # TODO: Fix failing tests:

     

       479
       479
       -
               rm test/DebugInfo/X86/vla-multi.ll

     

       480
       480
       -
             ''

     

       481
       361
        
             +

     

       482
       362
        
               # Fails in the presence of anti-virus software or other intrusion-detection software that

     

       483
       363
        
               # modifies the atime when run. See #284056.

     

       484
       484
       -
               lib.optionalString (lib.versionAtLeast release_version "16") (

     

       485
       485
       -
                 ''

     

       486
       486
       -
                   rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test

     

       487
       487
       -
                 ''

     

       488
       488
       -
                 + lib.optionalString (lib.versionOlder release_version "17") ''

     

       489
       489
       -
       

     

       490
       490
       -
                 ''

     

       491
       491
       -
               )

     

       492
       492
       -
             +

     

       493
       493
       -
               # timing-based tests are trouble

     

       494
       494
       -
               lib.optionalString

     

       495
       495
       -
                 (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17")

     

       496
       496
       -
                 ''

     

       497
       497
       -
                   rm utils/lit/tests/googletest-timeout.py

     

       498
       498
       -
                 ''

     

       364
       364
       +
               ''

     

       365
       365
       +
                 rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test

     

       366
       366
       +
               ''

     

       499
       367
        
             +

     

       500
       368
        
               # valgrind unhappy with musl or glibc, but fails w/musl only

     

       501
       369
        
               optionalString stdenv.hostPlatform.isMusl ''

     
···

       540
       408
        
               ''

     

       541
       409
        
             + ''

     

       542
       410
        
               patchShebangs test/BugPoint/compile-custom.ll.py

     

       543
       543
       -
             ''

     

       544
       544
       -
             +

     

       545
       545
       -
               # Tweak tests to ignore namespace part of type to support

     

       546
       546
       -
               # gcc-12: https://gcc.gnu.org/PR103598.

     

       547
       547
       -
               # The change below mangles strings like:

     

       548
       548
       -
               #    CHECK-NEXT: Starting llvm::Function pass manager run.

     

       549
       549
       -
               # to:

     

       550
       550
       -
               #    CHECK-NEXT: Starting {{.*}}Function pass manager run.

     

       551
       551
       -
               (lib.optionalString (lib.versionOlder release_version "13") (

     

       552
       552
       -
                 ''

     

       553
       553
       -
                   for f in \

     

       554
       554
       -
                     test/Other/new-pass-manager.ll \

     

       555
       555
       -
                     test/Other/new-pm-O0-defaults.ll \

     

       556
       556
       -
                     test/Other/new-pm-defaults.ll \

     

       557
       557
       -
                     test/Other/new-pm-lto-defaults.ll \

     

       558
       558
       -
                     test/Other/new-pm-thinlto-defaults.ll \

     

       559
       559
       -
                     test/Other/pass-pipeline-parsing.ll \

     

       560
       560
       -
                     test/Transforms/Inline/cgscc-incremental-invalidate.ll \

     

       561
       561
       -
                     test/Transforms/Inline/clear-analyses.ll \

     

       562
       562
       -
                     test/Transforms/LoopUnroll/unroll-loop-invalidation.ll \

     

       563
       563
       -
                     test/Transforms/SCCP/ipsccp-preserve-analysis.ll \

     

       564
       564
       -
                     test/Transforms/SCCP/preserve-analysis.ll \

     

       565
       565
       -
                     test/Transforms/SROA/dead-inst.ll \

     

       566
       566
       -
                     test/tools/gold/X86/new-pm.ll \

     

       567
       567
       -
                     ; do

     

       568
       568
       -
                     echo "PATCH: $f"

     

       569
       569
       -
                     substituteInPlace $f \

     

       570
       570
       -
                       --replace-quiet 'Starting llvm::' 'Starting {{.*}}' \

     

       571
       571
       -
                       --replace-quiet 'Finished llvm::' 'Finished {{.*}}'

     

       572
       572
       -
                   done

     

       573
       573
       -
                 ''

     

       574
       574
       -
                 +

     

       575
       575
       -
                   # gcc-13 fix

     

       576
       576
       -
                   ''

     

       577
       577
       -
                     sed -i '/#include <string>/i#include <cstdint>' \

     

       578
       578
       -
                       include/llvm/DebugInfo/Symbolize/DIPrinter.h

     

       579
       579
       -
                   ''

     

       580
       580
       -
               ));

     

       411
       411
       +
             '';

     

       581
       412
        
       

     

       582
       413
        
           # Workaround for configure flags that need to have spaces

     

       583
       414
        
           preConfigure = ''

     
···

       586
       417
        
             )

     

       587
       418
        
           '';

     

       588
       419
        
       

     

       420
       420
       +
           # Defensive check: some paths (that we make symlinks to) depend on the release

     

       421
       421
       +
           # version, for example:

     

       422
       422
       +
           #  - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185

     

       423
       423
       +
           #

     

       424
       424
       +
           # So we want to sure that the version in the source matches the release

     

       425
       425
       +
           # version we were given.

     

       426
       426
       +
           #

     

       427
       427
       +
           # We do this check here, in the LLVM build, because it happens early.

     

       428
       428
       +
           postConfigure =

     

       429
       429
       +
             let

     

       430
       430
       +
               v = lib.versions;

     

       431
       431
       +
               major = v.major release_version;

     

       432
       432
       +
               minor = v.minor release_version;

     

       433
       433
       +
               patch = v.patch release_version;

     

       434
       434
       +
             in

     

       435
       435
       +
             ''

     

       436
       436
       +
               # $1: part, $2: expected

     

       437
       437
       +
               check_version() {

     

       438
       438
       +
                 part="''${1^^}"

     

       439
       439
       +
                 part="$(cat include/llvm/Config/llvm-config.h  | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)"

     

       440
       440
       +
       

     

       441
       441
       +
                 if [[ "$part" != "$2" ]]; then

     

       442
       442
       +
                   echo >&2 \

     

       443
       443
       +
                     "mismatch in the $1 version! we have version ${release_version}" \

     

       444
       444
       +
                     "and expected the $1 version to be '$2'; the source has '$part' instead"

     

       445
       445
       +
                   exit 3

     

       446
       446
       +
                 fi

     

       447
       447
       +
               }

     

       448
       448
       +
       

     

       449
       449
       +
               check_version major ${major}

     

       450
       450
       +
               check_version minor ${minor}

     

       451
       451
       +
               check_version patch ${patch}

     

       452
       452
       +
             '';

     

       453
       453
       +
       

     

       589
       454
        
           # E.g. Mesa uses the build-id as a cache key (see #93946):

     

       590
       455
        
           LDFLAGS = optionalString (

     

       591
       456
        
             enableSharedLibraries && !stdenv.hostPlatform.isDarwin

     
···

       602
       467
        
               #

     

       603
       468
        
               # Some flags don't need to be repassed because LLVM already does so (like

     

       604
       469
        
               # CMAKE_BUILD_TYPE), others are irrelevant to the result.

     

       605
       605
       -
               flagsForLlvmConfig =

     

       606
       606
       -
                 (

     

       607
       607
       -
                   if lib.versionOlder release_version "15" then

     

       608
       608
       -
                     [

     

       609
       609
       -
                       (lib.cmakeFeature "LLVM_INSTALL_CMAKE_DIR" "${placeholder "dev"}/lib/cmake/llvm/")

     

       610
       610
       -
                     ]

     

       611
       611
       -
                   else

     

       612
       612
       -
                     [

     

       613
       613
       -
                       (lib.cmakeFeature "LLVM_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/llvm")

     

       614
       614
       -
                     ]

     

       615
       615
       -
                 )

     

       616
       616
       -
                 ++ [

     

       617
       617
       -
                   (lib.cmakeBool "LLVM_ENABLE_RTTI" true)

     

       618
       618
       -
                   (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" enableSharedLibraries)

     

       619
       619
       -
                   (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       620
       620
       -
                 ];

     

       470
       470
       +
               flagsForLlvmConfig = [

     

       471
       471
       +
                 (lib.cmakeFeature "LLVM_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/llvm")

     

       472
       472
       +
                 (lib.cmakeBool "LLVM_ENABLE_RTTI" true)

     

       473
       473
       +
                 (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" enableSharedLibraries)

     

       474
       474
       +
                 (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")

     

       475
       475
       +
               ];

     

       621
       476
        
             in

     

       622
       477
        
             flagsForLlvmConfig

     

       623
       478
        
             ++ [

     
···

       707
       562
        
             moveToOutput "bin/llvm-config*" "$dev"

     

       708
       563
        
             substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${lib.toLower finalAttrs.finalPackage.cmakeBuildType}.cmake" \

     

       709
       564
        
               --replace-fail "$out/bin/llvm-config" "$dev/bin/llvm-config"

     

       565
       565
       +
             substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \

     

       566
       566
       +
               --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'

     

       710
       567
        
           ''

     

       711
       711
       -
           + (

     

       712
       712
       -
             if lib.versionOlder release_version "15" then

     

       713
       713
       -
               ''

     

       714
       714
       -
                 substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \

     

       715
       715
       -
                   --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")'

     

       716
       716
       -
               ''

     

       717
       717
       -
             else

     

       718
       718
       -
               ''

     

       719
       719
       -
                 substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \

     

       720
       720
       -
                   --replace-fail 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")'

     

       721
       721
       -
               ''

     

       722
       722
       -
           )

     

       723
       568
        
           + optionalString (stdenv.hostPlatform.isDarwin && enableSharedLibraries) ''

     

       724
       724
       -
             ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${

     

       725
       725
       -
               if lib.versionOlder release_version "18" then "$shortVersion" else release_version

     

       726
       726
       -
             }.dylib

     

       569
       569
       +
             ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib

     

       727
       570
        
           ''

     

       728
       571
        
           + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (

     

       729
       572
        
             if stdenv.buildPlatform.canExecute stdenv.hostPlatform then

     
···

       739
       582
        
           doCheck =

     

       740
       583
        
             !isDarwinBootstrap

     

       741
       584
        
             && !stdenv.hostPlatform.isAarch32

     

       742
       742
       -
             && (if lib.versionOlder release_version "15" then stdenv.hostPlatform.isLinux else true)

     

       743
       585
        
             && (

     

       744
       586
        
               !stdenv.hostPlatform.isx86_32 # TODO: why

     

       745
       587
        
             )

     
···

       772
       614
        
             '';

     

       773
       615
        
           };

     

       774
       616
        
         }

     

       775
       775
       -
         // lib.optionalAttrs enableManpages (

     

       776
       776
       -
           {

     

       777
       777
       -
             pname = "llvm-manpages";

     

       617
       617
       +
         // lib.optionalAttrs enableManpages {

     

       618
       618
       +
           pname = "llvm-manpages";

     

       778
       619
        
       

     

       779
       779
       -
             propagatedBuildInputs = [ ];

     

       620
       620
       +
           propagatedBuildInputs = [ ];

     

       780
       621
        
       

     

       781
       781
       -
             postPatch = null;

     

       782
       782
       -
             postInstall = null;

     

       622
       622
       +
           ninjaFlags = [ "docs-llvm-man" ];

     

       623
       623
       +
           installTargets = [ "install-docs-llvm-man" ];

     

       783
       624
        
       

     

       784
       784
       -
             outputs = [ "out" ];

     

       625
       625
       +
           doCheck = false;

     

       785
       626
        
       

     

       786
       786
       -
             doCheck = false;

     

       627
       627
       +
           postPatch = null;

     

       628
       628
       +
           postInstall = null;

     

       787
       629
        
       

     

       788
       788
       -
             meta = llvm_meta // {

     

       789
       789
       -
               description = "man pages for LLVM ${version}";

     

       790
       790
       -
             };

     

       791
       791
       -
           }

     

       792
       792
       -
           // (

     

       793
       793
       -
             if lib.versionOlder release_version "15" then

     

       794
       794
       -
               {

     

       795
       795
       -
                 buildPhase = ''

     

       796
       796
       -
                   make docs-llvm-man

     

       797
       797
       -
                 '';

     

       630
       630
       +
           outputs = [ "out" ];

     

       798
       631
        
       

     

       799
       799
       -
                 installPhase = ''

     

       800
       800
       -
                   make -C docs install

     

       801
       801
       -
                 '';

     

       802
       802
       -
               }

     

       803
       803
       -
             else

     

       804
       804
       -
               {

     

       805
       805
       -
                 ninjaFlags = [ "docs-llvm-man" ];

     

       806
       806
       -
                 installTargets = [ "install-docs-llvm-man" ];

     

       807
       807
       -
       

     

       808
       808
       -
                 postPatch = null;

     

       809
       809
       -
                 postInstall = null;

     

       810
       810
       -
               }

     

       811
       811
       -
           )

     

       812
       812
       -
         )

     

       813
       813
       -
         // lib.optionalAttrs (lib.versionAtLeast release_version "13") {

     

       814
       814
       -
           nativeCheckInputs = [

     

       815
       815
       -
             which

     

       816
       816
       -
           ]

     

       817
       817
       -
           ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionAtLeast release_version "15") sysctl;

     

       818
       818
       -
         }

     

       819
       819
       -
         // lib.optionalAttrs (lib.versionOlder release_version "15") {

     

       820
       820
       -
           # hacky fix: created binaries need to be run before installation

     

       821
       821
       -
           preBuild = ''

     

       822
       822
       -
             mkdir -p $out/

     

       823
       823
       -
             ln -sv $PWD/lib $out

     

       824
       824
       -
           '';

     

       825
       825
       -
       

     

       826
       826
       -
           postBuild = ''

     

       827
       827
       -
             rm -fR $out

     

       828
       828
       -
           '';

     

       829
       829
       -
       

     

       830
       830
       -
           preCheck = ''

     

       831
       831
       -
             export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib

     

       832
       832
       -
           '';

     

       833
       833
       -
         }

     

       834
       834
       -
         // lib.optionalAttrs (lib.versionAtLeast release_version "15") {

     

       835
       835
       -
           # Defensive check: some paths (that we make symlinks to) depend on the release

     

       836
       836
       -
           # version, for example:

     

       837
       837
       -
           #  - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185

     

       838
       838
       -
           #

     

       839
       839
       -
           # So we want to sure that the version in the source matches the release

     

       840
       840
       -
           # version we were given.

     

       841
       841
       -
           #

     

       842
       842
       -
           # We do this check here, in the LLVM build, because it happens early.

     

       843
       843
       -
           postConfigure =

     

       844
       844
       -
             let

     

       845
       845
       -
               v = lib.versions;

     

       846
       846
       -
               major = v.major release_version;

     

       847
       847
       -
               minor = v.minor release_version;

     

       848
       848
       -
               patch = v.patch release_version;

     

       849
       849
       -
             in

     

       850
       850
       -
             ''

     

       851
       851
       -
               # $1: part, $2: expected

     

       852
       852
       -
               check_version() {

     

       853
       853
       -
                 part="''${1^^}"

     

       854
       854
       -
                 part="$(cat include/llvm/Config/llvm-config.h  | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)"

     

       855
       855
       -
       

     

       856
       856
       -
                 if [[ "$part" != "$2" ]]; then

     

       857
       857
       -
                   echo >&2 \

     

       858
       858
       -
                     "mismatch in the $1 version! we have version ${release_version}" \

     

       859
       859
       -
                     "and expected the $1 version to be '$2'; the source has '$part' instead"

     

       860
       860
       -
                   exit 3

     

       861
       861
       -
                 fi

     

       862
       862
       -
               }

     

       863
       863
       -
       

     

       864
       864
       -
               check_version major ${major}

     

       865
       865
       -
               check_version minor ${minor}

     

       866
       866
       -
               check_version patch ${patch}

     

       867
       867
       -
             '';

     

       632
       632
       +
           meta = llvm_meta // {

     

       633
       633
       +
             description = "man pages for LLVM ${version}";

     

       634
       634
       +
           };

     

       868
       635
        
         }

     

       869
       636
        
       )

-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

+74 -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;

     

       28
       28
       +
       stdenv.mkDerivation (finalAttrs: {

     

       29
       29
       +
         pname = "openmp";

     

       30
       30
       +
         inherit version;

     

       33
       31
        
       

     

       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;

     

       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;

     

       49
       41
        
       

     

       50
       50
       -
           sourceRoot = "${finalAttrs.src.name}/openmp";

     

       42
       42
       +
         sourceRoot = "${finalAttrs.src.name}/openmp";

     

       51
       43
        
       

     

       52
       52
       -
           outputs = [ "out" ] ++ lib.optionals (lib.versionAtLeast release_version "14") [ "dev" ];

     

       44
       44
       +
         outputs = [

     

       45
       45
       +
           "out"

     

       46
       46
       +
           "dev"

     

       47
       47
       +
         ];

     

       53
       48
        
       

     

       54
       54
       -
           patchFlags = if lib.versionOlder release_version "14" then [ "-p2" ] else null;

     

       49
       49
       +
         # TODO: Remove on `staging`.

     

       50
       50
       +
         patchFlags = null;

     

       55
       51
        
       

     

       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
       -
                 );

     

       52
       52
       +
         patches =

     

       53
       53
       +
           lib.optional (lib.versionOlder release_version "19") (getVersionFile "openmp/fix-find-tool.patch")

     

       54
       54
       +
           ++ [

     

       55
       55
       +
             (getVersionFile "openmp/run-lit-directly.patch")

     

       56
       56
       +
           ];

     

       57
       57
       +
       

     

       58
       58
       +
         nativeBuildInputs = [

     

       59
       59
       +
           cmake

     

       60
       60
       +
           python3.pythonOnBuildForHost

     

       61
       61
       +
           perl

     

       62
       62
       +
           ninja

     

       63
       63
       +
           pkg-config

     

       64
       64
       +
           lit

     

       65
       65
       +
         ];

     

       66
       66
       +
       

     

       67
       67
       +
         buildInputs = [

     

       68
       68
       +
           (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

     

       69
       69
       +
         ]

     

       70
       70
       +
         ++ lib.optionals (ompdSupport && ompdGdbSupport) [

     

       71
       71
       +
           python3

     

       72
       72
       +
         ];

     

       73
       73
       +
       

     

       74
       74
       +
         cmakeFlags = [

     

       75
       75
       +
           (lib.cmakeBool "LIBOMP_ENABLE_SHARED" (

     

       76
       76
       +
             !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.hasSharedLibraries

     

       77
       77
       +
           ))

     

       78
       78
       +
           (lib.cmakeBool "LIBOMP_OMPD_SUPPORT" ompdSupport)

     

       79
       79
       +
           (lib.cmakeBool "LIBOMP_OMPD_GDB_SUPPORT" ompdGdbSupport)

     

       80
       80
       +
           (lib.cmakeFeature "CLANG_TOOL" "${clang-unwrapped}/bin/clang")

     

       81
       81
       +
           (lib.cmakeFeature "OPT_TOOL" "${llvm}/bin/opt")

     

       82
       82
       +
           (lib.cmakeFeature "LINK_TOOL" "${llvm}/bin/llvm-link")

     

       83
       83
       +
         ]

     

       84
       84
       +
         ++ devExtraCmakeFlags;

     

       75
       85
        
       

     

       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

     

       87
       87
       -
           ];

     

       86
       86
       +
         doCheck = false;

     

       88
       87
        
       

     

       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
       -
           ];

     

       88
       88
       +
         checkTarget = "check-openmp";

     

       95
       89
        
       

     

       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;

     

       90
       90
       +
         preCheck = ''

     

       91
       91
       +
           patchShebangs ../tools/archer/tests/deflake.bash

     

       92
       92
       +
         '';

     

       112
       93
        
       

     

       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

     

       94
       94
       +
         meta = llvm_meta // {

     

       95
       95
       +
           homepage = "https://openmp.llvm.org/";

     

       96
       96
       +
           description = "Support for the OpenMP language";

     

       97
       97
       +
           longDescription = ''

     

       98
       98
       +
             The OpenMP subproject of LLVM contains the components required to build an

     

       99
       99
       +
             executable OpenMP program that are outside the compiler itself.

     

       100
       100
       +
             Contains the code for the runtime library against which code compiled by

     

       101
       101
       +
             "clang -fopenmp" must be linked before it can run and the library that

     

       102
       102
       +
             supports offload to target devices.

     

       136
       103
        
           '';

     

       137
       137
       -
         })

     

       138
       138
       -
       )

     

       104
       104
       +
           # "All of the code is dual licensed under the MIT license and the UIUC

     

       105
       105
       +
           # License (a BSD-like license)":

     

       106
       106
       +
           license = with lib.licenses; [

     

       107
       107
       +
             mit

     

       108
       108
       +
             ncsa

     

       109
       109
       +
           ];

     

       110
       110
       +
         };

     

       111
       111
       +
       })

+8 -151

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 = ../12;

     

       6
       6
       -
           }

     

       7
       7
       -
           {

     

       8
       4
        
             after = "19";

     

       9
       5
        
             path = ../19;

     

       10
       6
        
           }

     

       11
       7
        
         ];

     

       12
       8
        
         "clang/purity.patch" = [

     

       13
       9
        
           {

     

       14
       14
       -
             after = "18";

     

       15
       10
        
             path = ../18;

     

       16
       11
        
           }

     

       17
       17
       -
           {

     

       18
       18
       -
             before = "17";

     

       19
       19
       -
             after = "15";

     

       20
       20
       -
             path = ../15;

     

       21
       21
       -
           }

     

       22
       22
       -
           {

     

       23
       23
       -
             before = "16";

     

       24
       24
       -
             path = ../12;

     

       25
       25
       -
           }

     

       26
       26
       -
         ];

     

       27
       27
       -
         "clang/aarch64-tblgen.patch" = [

     

       28
       28
       -
           {

     

       29
       29
       -
             after = "17";

     

       30
       30
       -
             before = "18";

     

       31
       31
       -
             path = ../17;

     

       32
       32
       -
           }

     

       33
       33
       -
         ];

     

       34
       34
       -
         "lld/add-table-base.patch" = [

     

       35
       35
       -
           {

     

       36
       36
       -
             after = "16";

     

       37
       37
       -
             path = ../16;

     

       38
       38
       -
           }

     

       39
       12
        
         ];

     

       40
       13
        
         "lld/gnu-install-dirs.patch" = [

     

       41
       14
        
           {

     

       42
       42
       -
             after = "18";

     

       43
       15
        
             path = ../18;

     

       44
       16
        
           }

     

       45
       45
       -
           {

     

       46
       46
       -
             before = "14";

     

       47
       47
       -
             path = ../12;

     

       48
       48
       -
           }

     

       49
       17
        
         ];

     

       50
       18
        
         "llvm/gnu-install-dirs.patch" = [

     

       51
       19
        
           {

     
···

       63
       31
        
             path = ../20;

     

       64
       32
        
           }

     

       65
       33
        
           {

     

       66
       66
       -
             after = "18";

     

       67
       34
        
             before = "20";

     

       68
       35
        
             path = ../18;

     

       69
       36
        
           }

     
···

       75
       42
        
           }

     

       76
       43
        
           {

     

       77
       44
        
             before = "20";

     

       78
       78
       -
             after = "18";

     

       79
       45
        
             path = ../18;

     

       80
       46
        
           }

     

       81
       81
       -
           {

     

       82
       82
       -
             before = "18";

     

       83
       83
       -
             after = "14";

     

       84
       84
       -
             path = ../14;

     

       85
       85
       -
           }

     

       86
       47
        
         ];

     

       87
       48
        
         "llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       88
       49
        
           {

     

       89
       89
       -
             before = "17";

     

       90
       90
       -
             after = "15";

     

       91
       91
       -
             path = ../15;

     

       92
       92
       -
           }

     

       93
       93
       -
           {

     

       94
       94
       -
             after = "17";

     

       95
       95
       -
             path = ../17;

     

       50
       50
       +
             path = ../18;

     

       96
       51
        
           }

     

       97
       52
        
         ];

     

       98
       53
        
         "llvm/lit-shell-script-runner-set-dyld-library-path.patch" = [

     

       99
       54
        
           {

     

       100
       100
       -
             after = "18";

     

       101
       55
        
             path = ../18;

     

       102
       56
        
           }

     

       103
       103
       -
           {

     

       104
       104
       -
             after = "16";

     

       105
       105
       -
             before = "18";

     

       106
       106
       -
             path = ../16;

     

       107
       107
       -
           }

     

       108
       57
        
         ];

     

       109
       58
        
         "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch" = [

     

       110
       59
        
           {

     

       111
       111
       -
             after = "15";

     

       112
       112
       -
             path = ../15;

     

       113
       113
       -
           }

     

       114
       114
       -
         ];

     

       115
       115
       -
         "libunwind/gnu-install-dirs.patch" = [

     

       116
       116
       -
           {

     

       117
       117
       -
             before = "17";

     

       118
       118
       -
             after = "15";

     

       119
       119
       -
             path = ../15;

     

       60
       60
       +
             path = ../18;

     

       120
       61
        
           }

     

       121
       62
        
         ];

     

       122
       63
        
         "compiler-rt/X86-support-extension.patch" = [

     

       123
       64
        
           {

     

       124
       124
       -
             after = "15";

     

       125
       125
       -
             path = ../15;

     

       126
       126
       -
           }

     

       127
       127
       -
           {

     

       128
       128
       -
             before = "15";

     

       129
       129
       -
             path = ../12;

     

       65
       65
       +
             path = ../18;

     

       130
       66
        
           }

     

       131
       67
        
         ];

     

       132
       68
        
         "compiler-rt/armv6-scudo-libatomic.patch" = [

     
···

       135
       71
        
             path = ../19;

     

       136
       72
        
           }

     

       137
       73
        
           {

     

       138
       138
       -
             after = "15";

     

       139
       74
        
             before = "19";

     

       140
       140
       -
             path = ../15;

     

       141
       141
       -
           }

     

       142
       142
       -
           {

     

       143
       143
       -
             before = "15";

     

       144
       144
       -
             path = ../14;

     

       145
       145
       -
           }

     

       146
       146
       -
         ];

     

       147
       147
       -
         "compiler-rt/armv7l.patch" = [

     

       148
       148
       -
           {

     

       149
       149
       -
             before = "15";

     

       150
       150
       -
             after = "13";

     

       151
       151
       -
             path = ../13;

     

       152
       152
       -
           }

     

       153
       153
       -
         ];

     

       154
       154
       -
         "compiler-rt/gnu-install-dirs.patch" = [

     

       155
       155
       -
           {

     

       156
       156
       -
             before = "14";

     

       157
       157
       -
             path = ../12;

     

       158
       158
       -
           }

     

       159
       159
       -
           {

     

       160
       160
       -
             after = "13";

     

       161
       161
       -
             before = "15";

     

       162
       162
       -
             path = ../14;

     

       163
       163
       -
           }

     

       164
       164
       -
           {

     

       165
       165
       -
             after = "15";

     

       166
       166
       -
             before = "17";

     

       167
       167
       -
             path = ../15;

     

       168
       168
       -
           }

     

       169
       169
       -
           {

     

       170
       170
       -
             after = "16";

     

       171
       171
       -
             path = ../17;

     

       172
       172
       -
           }

     

       173
       173
       -
         ];

     

       174
       174
       -
         "compiler-rt/darwin-targetconditionals.patch" = [

     

       175
       175
       -
           {

     

       176
       176
       -
             after = "13";

     

       177
       177
       -
             path = ../13;

     

       178
       178
       -
           }

     

       179
       179
       -
         ];

     

       180
       180
       -
         "compiler-rt/codesign.patch" = [

     

       181
       181
       -
           {

     

       182
       182
       -
             after = "13";

     

       183
       183
       -
             path = ../13;

     

       75
       75
       +
             path = ../18;

     

       184
       76
        
           }

     

       185
       77
        
         ];

     

       186
       78
        
         "compiler-rt/normalize-var.patch" = [

     

       187
       79
        
           {

     

       188
       188
       -
             after = "16";

     

       189
       189
       -
             path = ../16;

     

       190
       190
       -
           }

     

       191
       191
       -
           {

     

       192
       192
       -
             before = "16";

     

       193
       193
       -
             path = ../12;

     

       194
       194
       -
           }

     

       195
       195
       -
         ];

     

       196
       196
       -
         "lldb/procfs.patch" = [

     

       197
       197
       -
           {

     

       198
       198
       -
             after = "15";

     

       199
       199
       -
             path = ../15;

     

       200
       200
       -
           }

     

       201
       201
       -
           {

     

       202
       202
       -
             before = "15";

     

       203
       203
       -
             path = ../12;

     

       204
       204
       -
           }

     

       205
       205
       -
         ];

     

       206
       206
       -
         "lldb/resource-dir.patch" = [

     

       207
       207
       -
           {

     

       208
       208
       -
             before = "16";

     

       209
       209
       -
             path = ../12;

     

       210
       210
       -
           }

     

       211
       211
       -
         ];

     

       212
       212
       -
         "llvm/no-pipes.patch" = [

     

       213
       213
       -
           {

     

       214
       214
       -
             before = "16";

     

       215
       215
       -
             path = ../12;

     

       80
       80
       +
             path = ../18;

     

       216
       81
        
           }

     

       217
       82
        
         ];

     

       218
       83
        
         "openmp/fix-find-tool.patch" = [

     

       219
       84
        
           {

     

       220
       220
       -
             after = "17";

     

       221
       85
        
             before = "19";

     

       222
       222
       -
             path = ../17;

     

       86
       86
       +
             path = ../18;

     

       223
       87
        
           }

     

       224
       88
        
         ];

     

       225
       89
        
         "openmp/run-lit-directly.patch" = [

     

       226
       90
        
           {

     

       227
       227
       -
             after = "16";

     

       228
       228
       -
             path = ../16;

     

       229
       229
       -
           }

     

       230
       230
       -
           {

     

       231
       231
       -
             after = "14";

     

       232
       232
       -
             before = "16";

     

       233
       233
       -
             path = ../14;

     

       91
       91
       +
             path = ../18;

     

       234
       92
        
           }

     

       235
       93
        
         ];

     

       236
       94
        
         "libclc/use-default-paths.patch" = [

     
···

       246
       104
        
         ];

     

       247
       105
        
         "libclc/gnu-install-dirs.patch" = [

     

       248
       106
        
           {

     

       249
       249
       -
             after = "16";

     

       250
       107
        
             before = "21";

     

       251
       251
       -
             path = ../16;

     

       108
       108
       +
             path = ../18;

     

       252
       109
        
           }

     

       253
       110
        
           {

     

       254
       111
        
             after = "21";

+18 -34

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
        
       

     
···

       60
       54
        
         targets = [

     

       61
       55
        
           "clang-tblgen"

     

       62
       56
        
           "llvm-tblgen"

     

       63
       63
       -
         ]

     

       64
       64
       -
         ++ lib.optionals (lib.versionAtLeast release_version "15") [

     

       65
       57
        
           "clang-tidy-confusable-chars-gen"

     

       66
       66
       -
         ]

     

       67
       67
       -
         ++ lib.optionals (lib.versionAtLeast release_version "16") [

     

       68
       58
        
           "mlir-tblgen"

     

       69
       59
        
         ]

     

       70
       70
       -
         ++

     

       71
       71
       -
           lib.optionals ((lib.versionAtLeast release_version "15") && (lib.versionOlder release_version "20"))

     

       72
       72
       -
             [

     

       73
       73
       -
               "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.

     

       74
       74
       -
             ];

     

       60
       60
       +
         ++ lib.optionals (lib.versionOlder release_version "20") [

     

       61
       61
       +
           "clang-pseudo-gen" # Removed in LLVM 20 @ ed8f78827895050442f544edef2933a60d4a7935.

     

       62
       62
       +
         ];

     

       75
       63
        
       

     

       76
       64
        
         self = stdenv.mkDerivation (finalAttrs: {

     

       77
       65
        
           inherit pname version patches;

     
···

       105
       93
        
           cmakeFlags = [

     

       106
       94
        
             # Projects with tablegen-like tools.

     

       107
       95
        
             "-DLLVM_ENABLE_PROJECTS=${

     

       108
       108
       -
               lib.concatStringsSep ";" (

     

       109
       109
       -
                 [

     

       110
       110
       -
                   "llvm"

     

       111
       111
       -
                   "clang"

     

       112
       112
       -
                   "clang-tools-extra"

     

       113
       113
       -
                 ]

     

       114
       114
       -
                 ++ lib.optionals (lib.versionAtLeast release_version "16") [

     

       115
       115
       -
                   "mlir"

     

       116
       116
       -
                 ]

     

       117
       117
       -
               )

     

       96
       96
       +
               lib.concatStringsSep ";" [

     

       97
       97
       +
                 "llvm"

     

       98
       98
       +
                 "clang"

     

       99
       99
       +
                 "clang-tools-extra"

     

       100
       100
       +
                 "mlir"

     

       101
       101
       +
               ]

     

       118
       102
        
             }"

     

       119
       103
        
           ]

     

       120
       104
        
           ++ devExtraCmakeFlags;

-6

pkgs/development/compilers/llvm/default.nix

···

       22
       22
        
       }@packageSetArgs:

     

       23
       23
        
       let

     

       24
       24
        
         versions = {

     

       25
       25
       -
           "12.0.1".officialRelease.sha256 = "08s5w2db9imb2yaqsvxs6pg21csi1cf6wa35rf8x6q07mam7j8qv";

     

       26
       26
       -
           "13.0.1".officialRelease.sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k";

     

       27
       27
       -
           "14.0.6".officialRelease.sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";

     

       28
       28
       -
           "15.0.7".officialRelease.sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";

     

       29
       29
       -
           "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";

     

       30
       30
       -
           "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";

     

       31
       25
        
           "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";

     

       32
       26
        
           "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";

     

       33
       27
        
           "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";

+5 -31

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
       -
       elif [ "$VERSION_MAJOR" -eq "13" ]; then

     

       28
       28
       -
         readonly SOURCES=(

     

       29
       29
       -
           "llvm.src"

     

       30
       30
       -
         )

     

       31
       31
       -
       else

     

       32
       32
       -
         readonly SOURCES=(

     

       33
       33
       -
           "clang-unwrapped.src"

     

       34
       34
       -
           "compiler-rt.src"

     

       35
       35
       -
           "clang-unwrapped.clang-tools-extra_src"

     

       36
       36
       -
           "libcxx.src"

     

       37
       37
       -
           "libcxxabi.src"

     

       38
       38
       -
           "libunwind.src"

     

       39
       39
       -
           "lld.src"

     

       40
       40
       -
           "lldb.src"

     

       41
       41
       -
           "llvm.src"

     

       42
       42
       -
           "llvm.polly_src"

     

       43
       43
       -
           "openmp.src"

     

       44
       44
       -
         )

     

       45
       45
       -
       fi

     

       46
       46
       -
       

     

       47
       47
       -
       for SOURCE in "${SOURCES[@]}"; do

     

       48
       48
       -
         echo "Updating the hash of $SOURCE:"

     

       49
       49
       -
         declare ATTR="$ATTRSET.$SOURCE"

     

       50
       50
       -
         declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)"

     

       51
       51
       -
         declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\""

     

       52
       52
       -
         find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} +

     

       53
       53
       -
       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/" {} +

     

       54
       28
        
       

     

       55
       29
        
       echo OK

+22 -3

pkgs/development/compilers/mrustc/bootstrap.nix

···

       4
       4
        
         fetchurl,

     

       5
       5
        
         mrustc,

     

       6
       6
        
         mrustc-minicargo,

     

       7
       7
       -
         llvm_12,

     

       7
       7
       +
         #llvm_12,

     

       8
       8
        
         libffi,

     

       9
       9
        
         cmake,

     

       10
       10
        
         perl,

     
···

       64
       64
        
         ];

     

       65
       65
        
         buildInputs = [

     

       66
       66
        
           # for rustc

     

       67
       67
       -
           llvm_12

     

       67
       67
       +
           #llvm_12

     

       68
       68
        
           libffi

     

       69
       69
        
           zlib

     

       70
       70
        
           libxml2

     
···

       76
       76
        
           # Use shared mrustc/minicargo/llvm instead of rebuilding them

     

       77
       77
        
           "MRUSTC=${mrustc}/bin/mrustc"

     

       78
       78
        
           #"MINICARGO=${mrustc-minicargo}/bin/minicargo"  # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied

     

       79
       79
       -
           "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"

     

       79
       79
       +
           #"LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config"

     

       80
       80
        
           "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}"

     

       81
       81
        
         ];

     

       82
       82
        
       

     
···

       153
       153
        
             asl20

     

       154
       154
        
           ];

     

       155
       155
        
           platforms = [ "x86_64-linux" ];

     

       156
       156
       +
           # rustc 1.54 only supports LLVM 12, which was removed from Nixpkgs.

     

       157
       157
       +
           # mrustc can bootstrap up to rustc 1.74, which supported LLVM 17,

     

       158
       158
       +
           # which has also been removed.

     

       159
       159
       +
           #

     

       160
       160
       +
           # 1.74 also shipped with the Cranelift backend, so perhaps that

     

       161
       161
       +
           # could be used instead? Alternatively, it may be possible to

     

       162
       162
       +
           # backport the upstream patches to support LLVM 18 to 1.74.

     

       163
       163
       +
           # Assuming LLVM 18 is still in Nixpkgs by the time you read this

     

       164
       164
       +
           # comment, anyway. But if not, then maybe mrustc has been updated

     

       165
       165
       +
           # to support newer rustc versions? Hope springs eternal.

     

       166
       166
       +
           #

     

       167
       167
       +
           # (Note that you still have to “draw the rest of the owl” to

     

       168
       168
       +
           # bootstrap the chain of rustc versions between this bootstrap

     

       169
       169
       +
           # and the version currently used in Nixpkgs, anyway, so this was

     

       170
       170
       +
           # already not useful for bootstrapping a Rust compiler for use with

     

       171
       171
       +
           # Nixpkgs without a lot of additional work. See Guix’s Rust

     

       172
       172
       +
           # bootstrap chain, or the non‐Rust minimal bootstrap in Guix and

     

       173
       173
       +
           # Nixpkgs, for inspiration.)

     

       174
       174
       +
           broken = true;

     

       156
       175
        
         };

     

       157
       176
        
       }

+6 -1

pkgs/development/haskell-modules/with-packages-wrapper.nix

···

       182
       182
        
           + postBuild;

     

       183
       183
        
           preferLocalBuild = true;

     

       184
       184
        
           passthru = {

     

       185
       185
       -
             inherit (ghc) version meta targetPrefix;

     

       185
       185
       +
             inherit (ghc) version targetPrefix;

     

       186
       186
        
       

     

       187
       187
        
             hoogle = hoogleWithPackages';

     

       188
       188
        
       

     
···

       202
       202
        
       

     

       203
       203
        
                 Also note that withLLVM has been renamed to useLLVM for consistency with

     

       204
       204
        
                 the GHC Nix expressions.'';

     

       205
       205
       +
           };

     

       206
       206
       +
           pos = __curPos;

     

       207
       207
       +
           meta = ghc.meta // {

     

       208
       208
       +
             # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.

     

       209
       209
       +
             broken = useLLVM;

     

       205
       210
        
           };

     

       206
       211
        
         }

-84

pkgs/development/tools/analysis/ikos/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         stdenv,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         boost,

     

       7
       7
       -
         tbb,

     

       8
       8
       -
         gmp,

     

       9
       9
       -
         llvm,

     

       10
       10
       -
         clang,

     

       11
       11
       -
         sqlite,

     

       12
       12
       -
         python3,

     

       13
       13
       -
         ocamlPackages,

     

       14
       14
       -
         mpfr,

     

       15
       15
       -
         ppl,

     

       16
       16
       -
         doxygen,

     

       17
       17
       -
         graphviz,

     

       18
       18
       -
       }:

     

       19
       19
       -
       

     

       20
       20
       -
       stdenv.mkDerivation rec {

     

       21
       21
       -
         pname = "ikos";

     

       22
       22
       -
         version = "3.5";

     

       23
       23
       -
       

     

       24
       24
       -
         src = fetchFromGitHub {

     

       25
       25
       -
           owner = "NASA-SW-VnV";

     

       26
       26
       -
           repo = "ikos";

     

       27
       27
       -
           rev = "v${version}";

     

       28
       28
       -
           hash = "sha256-kqgGD0plTW0N30kD7Y8xOvGODplJbi37Wh6yYAkzNKI=";

     

       29
       29
       -
         };

     

       30
       30
       -
       

     

       31
       31
       -
         nativeBuildInputs = [

     

       32
       32
       -
           cmake

     

       33
       33
       -
           python3.pkgs.setuptools

     

       34
       34
       -
           python3.pkgs.wheel

     

       35
       35
       -
           python3.pkgs.build

     

       36
       36
       -
           python3.pkgs.installer

     

       37
       37
       -
           python3.pkgs.wrapPython

     

       38
       38
       -
         ];

     

       39
       39
       -
       

     

       40
       40
       -
         buildInputs = [

     

       41
       41
       -
           boost

     

       42
       42
       -
           tbb

     

       43
       43
       -
           gmp

     

       44
       44
       -
           clang

     

       45
       45
       -
           llvm

     

       46
       46
       -
           sqlite

     

       47
       47
       -
           python3

     

       48
       48
       -
           ocamlPackages.apron

     

       49
       49
       -
           mpfr

     

       50
       50
       -
           ppl

     

       51
       51
       -
           doxygen

     

       52
       52
       -
           graphviz

     

       53
       53
       -
         ];

     

       54
       54
       -
       

     

       55
       55
       -
         propagatedBuildInputs = [

     

       56
       56
       -
           python3.pkgs.pygments

     

       57
       57
       -
         ];

     

       58
       58
       -
       

     

       59
       59
       -
         cmakeFlags = [

     

       60
       60
       -
           "-DAPRON_ROOT=${ocamlPackages.apron}"

     

       61
       61
       -
           "-DINSTALL_PYTHON_VIRTUALENV=off"

     

       62
       62
       -
           "-DPYTHON_VENV_EXECUTABLE=${python3}/bin/python"

     

       63
       63
       -
         ];

     

       64
       64
       -
       

     

       65
       65
       -
         postBuild = ''

     

       66
       66
       -
           make doc

     

       67
       67
       -
           ${python3}/bin/python -m build --no-isolation --outdir dist/ --wheel analyzer/python

     

       68
       68
       -
         '';

     

       69
       69
       -
       

     

       70
       70
       -
         postInstall = ''

     

       71
       71
       -
           ${python3}/bin/python -m installer --prefix "$out" dist/*.whl

     

       72
       72
       -
         '';

     

       73
       73
       -
       

     

       74
       74
       -
         postFixup = ''

     

       75
       75
       -
           wrapPythonPrograms

     

       76
       76
       -
         '';

     

       77
       77
       -
       

     

       78
       78
       -
         meta = with lib; {

     

       79
       79
       -
           homepage = "https://github.com/NASA-SW-VnV/ikos";

     

       80
       80
       -
           description = "Static analyzer for C/C++ based on the theory of Abstract Interpretation";

     

       81
       81
       -
           license = licenses.nasa13;

     

       82
       82
       -
           maintainers = with maintainers; [ atnnn ];

     

       83
       83
       -
         };

     

       84
       84
       -
       }

pkgs/test/default.nix

···

       16
       16
        
                   (filter (n: n != "llvmPackages_9"))

     

       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"))

     

       21
       21
       +
                   (filter (n: n != "llvmPackages_14"))

     

       22
       22
       +
                   (filter (n: n != "llvmPackages_15"))

     

       23
       23
       +
                   (filter (n: n != "llvmPackages_16"))

     

       24
       24
       +
                   (filter (n: n != "llvmPackages_17"))

     

       19
       25
        
                 ];

     

       20
       26
        
                 tests = lib.genAttrs pkgSets (

     

       21
       27
        
                   name:

+63 -18

pkgs/top-level/aliases.nix

···

       514
       514
        
         beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18

     

       515
       515
        
         betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25

     

       516
       516
        
         betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25

     

       517
       517
       +
         bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       517
       518
        
         bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15

     

       518
       519
        
         bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27

     

       519
       520
        
         bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2025-06-17

     
···

       638
       639
        
         colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20

     

       639
       640
        
         colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19

     

       640
       641
        
         colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15

     

       642
       642
       +
         cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       641
       643
        
         connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27

     

       642
       644
        
         copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07

     

       643
       645
        
         copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     
···

       696
       698
        
         cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09

     

       697
       699
        
       

     

       698
       700
        
         # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.

     

       699
       699
       -
         clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08

     

       700
       700
       -
         clang12Stdenv = lowPrio llvmPackages_12.stdenv; # preserve, reason: see above

     

       701
       701
       -
         clang13Stdenv = lowPrio llvmPackages_13.stdenv; # preserve, reason: see above

     

       702
       702
       -
         clang14Stdenv = lowPrio llvmPackages_14.stdenv; # preserve, reason: see above

     

       703
       703
       -
         clang15Stdenv = lowPrio llvmPackages_15.stdenv; # preserve, reason: see above

     

       704
       704
       -
         clang16Stdenv = lowPrio llvmPackages_16.stdenv; # preserve, reason: see above

     

       705
       705
       -
         clang17Stdenv = lowPrio llvmPackages_17.stdenv; # preserve, reason: see above

     

       706
       701
        
         clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above

     

       707
       702
        
         clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above

     

       708
       703
        
       

     

       709
       709
       -
         clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       710
       710
       -
         clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       711
       711
       -
       

     

       712
       712
       -
         clang-tools_12 = llvmPackages_12.clang-tools; # Added 2024-04-22

     

       713
       713
       -
         clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22

     

       714
       714
       -
         clang-tools_14 = llvmPackages_14.clang-tools; # Added 2024-04-22

     

       715
       715
       -
         clang-tools_15 = llvmPackages_15.clang-tools; # Added 2024-04-22

     

       716
       716
       -
         clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22

     

       717
       717
       -
         clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22

     

       718
       704
        
         clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22

     

       719
       705
        
         clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21

     

       720
       706
        
       

     
···

       723
       709
        
       

     

       724
       710
        
         ### D ###

     

       725
       711
        
       

     

       712
       712
       +
         dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       726
       713
        
         dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10

     

       727
       714
        
         daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21

     

       728
       715
        
         darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10

     
···

       1158
       1145
        
         hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20

     

       1159
       1146
        
         hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21

     

       1160
       1147
        
         hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21

     

       1148
       1148
       +
         hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20

     

       1161
       1149
        
         hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05

     

       1162
       1150
        
         hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13

     

       1163
       1151
        
         hpp-fcl = coal; # Added 2024-11-15

     
···

       1179
       1167
        
         ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15

     

       1180
       1168
        
         ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25

     

       1181
       1169
        
         icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18

     

       1170
       1170
       +
         ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       1182
       1171
        
         imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17

     

       1183
       1172
        
         imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17

     

       1184
       1173
        
         imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17

     
···

       1480
       1469
        
       

     

       1481
       1470
        
         llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02

     

       1482
       1471
        
       

     

       1472
       1472
       +
         llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1473
       1473
       +
         llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1483
       1474
        
         lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1484
       1475
        
         lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1485
       1485
       -
         llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1486
       1486
       -
         llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1476
       1476
       +
         clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1477
       1477
       +
         clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08

     

       1478
       1478
       +
         clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08

     

       1479
       1479
       +
       

     

       1480
       1480
       +
         llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1481
       1481
       +
         llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1482
       1482
       +
         lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1483
       1483
       +
         lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1484
       1484
       +
         clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1485
       1485
       +
         clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1486
       1486
       +
         clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1487
       1487
       +
       

     

       1488
       1488
       +
         llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1489
       1489
       +
         llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1490
       1490
       +
         lld_13 = throw "lld_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1491
       1491
       +
         lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1492
       1492
       +
         clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1493
       1493
       +
         clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1494
       1494
       +
         clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1495
       1495
       +
       

     

       1496
       1496
       +
         llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1497
       1497
       +
         llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1498
       1498
       +
         lld_14 = throw "lld_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1499
       1499
       +
         lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1500
       1500
       +
         clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1501
       1501
       +
         clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1502
       1502
       +
         clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10

     

       1503
       1503
       +
       

     

       1504
       1504
       +
         llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1505
       1505
       +
         llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1506
       1506
       +
         lld_15 = throw "lld_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1507
       1507
       +
         lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1508
       1508
       +
         clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1509
       1509
       +
         clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1510
       1510
       +
         clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12

     

       1511
       1511
       +
       

     

       1512
       1512
       +
         llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1513
       1513
       +
         llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1514
       1514
       +
         lld_16 = throw "lld_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1515
       1515
       +
         lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1516
       1516
       +
         mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1517
       1517
       +
         clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1518
       1518
       +
         clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1519
       1519
       +
         clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1520
       1520
       +
       

     

       1521
       1521
       +
         llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1522
       1522
       +
         llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1523
       1523
       +
         lld_17 = throw "lld_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1524
       1524
       +
         lldb_17 = throw "lldb_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1525
       1525
       +
         mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1526
       1526
       +
         clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1527
       1527
       +
         clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1528
       1528
       +
         clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09

     

       1487
       1529
        
       

     

       1488
       1530
        
         lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17

     

       1489
       1531
        
         loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25

     
···

       1799
       1841
        
         oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17

     

       1800
       1842
        
         obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18

     

       1801
       1843
        
         ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30

     

       1844
       1844
       +
         oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       1802
       1845
        
         odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06

     

       1803
       1846
        
         offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01

     

       1804
       1847
        
         oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22

     
···

       2074
       2117
        
         qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20

     

       2075
       2118
        
         qflipper = qFlipper; # Added 2022-02-11

     

       2076
       2119
        
         qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26

     

       2120
       2120
       +
         qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19

     

       2077
       2121
        
         qscintilla = libsForQt5.qscintilla; # Added 2023-09-20

     

       2078
       2122
        
         qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20

     

       2079
       2123
        
         qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20

     
···

       2521
       2565
        
         ### W ###

     

       2522
       2566
        
         w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29

     

       2523
       2567
        
         wakatime = wakatime-cli; # 2024-05-30

     

       2568
       2568
       +
         wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10

     

       2524
       2569
        
         wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22

     

       2525
       2570
        
         wapp = tclPackages.wapp; # Added 2024-10-02

     

       2526
       2571
        
         wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24

+1 -56

pkgs/top-level/all-packages.nix

···

       2613
       2613
        
       

     

       2614
       2614
        
         compass = callPackage ../development/tools/compass { };

     

       2615
       2615
        
       

     

       2616
       2616
       -
         cone = callPackage ../development/compilers/cone {

     

       2617
       2617
       -
           llvmPackages = llvmPackages_13;

     

       2618
       2618
       -
         };

     

       2619
       2619
       -
       

     

       2620
       2616
        
         coreutils = callPackage ../tools/misc/coreutils { };

     

       2621
       2617
        
       

     

       2622
       2618
        
         # The coreutils above are built with dependencies from

     
···

       4637
       4633
        
         clang-manpages = llvmPackages.clang-manpages;

     

       4638
       4634
        
       

     

       4639
       4635
        
         clang = llvmPackages.clang;

     

       4640
       4640
       -
         clang_12 = llvmPackages_12.clang;

     

       4641
       4641
       -
         clang_13 = llvmPackages_13.clang;

     

       4642
       4642
       -
         clang_14 = llvmPackages_14.clang;

     

       4643
       4643
       -
         clang_15 = llvmPackages_15.clang;

     

       4644
       4644
       -
         clang_16 = llvmPackages_16.clang;

     

       4645
       4645
       -
         clang_17 = llvmPackages_17.clang;

     

       4646
       4636
        
       

     

       4647
       4637
        
         clang-tools = llvmPackages.clang-tools;

     

       4648
       4638
        
       

     
···

       4732
       4722
        
         flutter327 = flutterPackages.v3_27;

     

       4733
       4723
        
         flutter324 = flutterPackages.v3_24;

     

       4734
       4724
        
       

     

       4735
       4735
       -
         fpc = callPackage ../development/compilers/fpc {

     

       4736
       4736
       -
           # https://github.com/NixOS/nixpkgs/issues/416485

     

       4737
       4737
       -
           # TODO: remove when upstream issue is fixed:

     

       4738
       4738
       -
           # https://gitlab.com/freepascal.org/fpc/source/-/issues/41045

     

       4739
       4739
       -
           stdenv =

     

       4740
       4740
       -
             if stdenv.cc.isClang && stdenv.hostPlatform.isx86_64 then llvmPackages_17.stdenv else stdenv;

     

       4741
       4741
       -
         };

     

       4725
       4725
       +
         fpc = callPackage ../development/compilers/fpc { };

     

       4742
       4726
        
       

     

       4743
       4727
        
         gambit = callPackage ../development/compilers/gambit { };

     

       4744
       4728
        
         gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };

     
···

       5375
       5359
        
         };

     

       5376
       5360
        
       

     

       5377
       5361
        
         lld = llvmPackages.lld;

     

       5378
       5378
       -
         lld_12 = llvmPackages_12.lld;

     

       5379
       5379
       -
         lld_13 = llvmPackages_13.lld;

     

       5380
       5380
       -
         lld_14 = llvmPackages_14.lld;

     

       5381
       5381
       -
         lld_15 = llvmPackages_15.lld;

     

       5382
       5382
       -
         lld_16 = llvmPackages_16.lld;

     

       5383
       5383
       -
         lld_17 = llvmPackages_17.lld;

     

       5384
       5362
        
       

     

       5385
       5363
        
         lldb = llvmPackages.lldb;

     

       5386
       5386
       -
         lldb_12 = llvmPackages_12.lldb;

     

       5387
       5387
       -
         lldb_13 = llvmPackages_13.lldb;

     

       5388
       5388
       -
         lldb_14 = llvmPackages_14.lldb;

     

       5389
       5389
       -
         lldb_15 = llvmPackages_15.lldb;

     

       5390
       5390
       -
         lldb_16 = llvmPackages_16.lldb;

     

       5391
       5391
       -
         lldb_17 = llvmPackages_17.lldb;

     

       5392
       5364
        
       

     

       5393
       5365
        
         llvm = llvmPackages.llvm;

     

       5394
       5394
       -
         llvm_12 = llvmPackages_12.llvm;

     

       5395
       5395
       -
         llvm_13 = llvmPackages_13.llvm;

     

       5396
       5396
       -
         llvm_14 = llvmPackages_14.llvm;

     

       5397
       5397
       -
         llvm_15 = llvmPackages_15.llvm;

     

       5398
       5398
       -
         llvm_16 = llvmPackages_16.llvm;

     

       5399
       5399
       -
         llvm_17 = llvmPackages_17.llvm;

     

       5400
       5400
       -
       

     

       5401
       5401
       -
         mlir_16 = llvmPackages_16.mlir;

     

       5402
       5402
       -
         mlir_17 = llvmPackages_17.mlir;

     

       5403
       5366
        
         flang = llvmPackages_20.flang;

     

       5404
       5367
        
       

     

       5405
       5368
        
         libclc = llvmPackages.libclc;

     
···

       5412
       5375
        
           (rec {

     

       5413
       5376
        
             llvmPackagesSet = recurseIntoAttrs (callPackages ../development/compilers/llvm { });

     

       5414
       5377
        
       

     

       5415
       5415
       -
             llvmPackages_12 = llvmPackagesSet."12";

     

       5416
       5416
       -
             llvmPackages_13 = llvmPackagesSet."13";

     

       5417
       5417
       -
             llvmPackages_14 = llvmPackagesSet."14";

     

       5418
       5418
       -
             llvmPackages_15 = llvmPackagesSet."15";

     

       5419
       5419
       -
             llvmPackages_16 = llvmPackagesSet."16";

     

       5420
       5420
       -
             llvmPackages_17 = llvmPackagesSet."17";

     

       5421
       5421
       -
       

     

       5422
       5378
        
             llvmPackages_18 = llvmPackagesSet."18";

     

       5423
       5379
        
             clang_18 = llvmPackages_18.clang;

     

       5424
       5380
        
             lld_18 = llvmPackages_18.lld;

     
···

       5450
       5406
        
       

     

       5451
       5407
        
             mkLLVMPackages = llvmPackagesSet.mkPackage;

     

       5452
       5408
        
           })

     

       5453
       5453
       -
           llvmPackages_12

     

       5454
       5454
       -
           llvmPackages_13

     

       5455
       5455
       -
           llvmPackages_14

     

       5456
       5456
       -
           llvmPackages_15

     

       5457
       5457
       -
           llvmPackages_16

     

       5458
       5458
       -
           llvmPackages_17

     

       5459
       5409
        
           llvmPackages_18

     

       5460
       5410
        
           clang_18

     

       5461
       5411
        
           lld_18

     
···

       6868
       6818
        
         iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { };

     

       6869
       6819
        
         iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { };

     

       6870
       6820
        
         iaca = iaca_3_0;

     

       6871
       6871
       -
       

     

       6872
       6872
       -
         ikos = callPackage ../development/tools/analysis/ikos {

     

       6873
       6873
       -
           inherit (llvmPackages_14) stdenv clang llvm;

     

       6874
       6874
       -
           tbb = tbb_2022;

     

       6875
       6875
       -
         };

     

       6876
       6821
        
       

     

       6877
       6822
        
         include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {

     

       6878
       6823
        
           llvmPackages = llvmPackages_20;

+13 -28

pkgs/top-level/haskell-packages.nix

···

       48
       48
        
         # Use this rather than `rec { ... }` below for sake of overlays.

     

       49
       49
        
         inherit (pkgs.haskell) compiler packages;

     

       50
       50
        
       

     

       51
       51
       +
         buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;

     

       52
       52
       +
         llvmPackages = pkgs.llvmPackages_20;

     

       53
       53
       +
       

     

       51
       54
        
       in

     

       52
       55
        
       {

     

       53
       56
        
         lib = haskellLibUncomposable;

     
···

       72
       75
        
           {

     

       73
       76
        
             # Required to bootstrap 9.4.8.

     

       74
       77
        
             ghc902Binary = callPackage ../development/compilers/ghc/9.0.2-binary.nix {

     

       75
       75
       -
               llvmPackages = pkgs.llvmPackages_20;

     

       78
       78
       +
               inherit llvmPackages;

     

       76
       79
        
             };

     

       77
       80
        
       

     

       78
       81
        
             ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };

     
···

       91
       94
        
               # https://github.com/xattr/xattr/issues/44 and

     

       92
       95
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       93
       96
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       94
       94
       -
               # Support range >= 10 && < 14

     

       95
       95
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;

     

       96
       96
       -
               llvmPackages = pkgs.llvmPackages_12;

     

       97
       97
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       97
       98
        
             };

     

       98
       99
        
             ghc94 = compiler.ghc948;

     

       99
       100
        
             ghc963 = callPackage ../development/compilers/ghc/9.6.3.nix {

     
···

       103
       104
        
               # https://github.com/xattr/xattr/issues/44 and

     

       104
       105
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       105
       106
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       106
       106
       -
               # Support range >= 11 && < 16

     

       107
       107
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       108
       108
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       107
       107
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       109
       108
        
             };

     

       110
       109
        
             ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {

     

       111
       110
        
               bootPkgs = bb.packages.ghc924Binary;

     
···

       114
       113
        
               # https://github.com/xattr/xattr/issues/44 and

     

       115
       114
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       116
       115
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       117
       117
       -
               # Support range >= 11 && < 16

     

       118
       118
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       119
       119
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       116
       116
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       120
       117
        
             };

     

       121
       118
        
             ghc96 = compiler.ghc967;

     

       122
       119
        
             ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {

     
···

       130
       127
        
               # https://github.com/xattr/xattr/issues/44 and

     

       131
       128
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       132
       129
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       133
       133
       -
               # Support range >= 11 && < 16

     

       134
       134
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       135
       135
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       130
       130
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       136
       131
        
             };

     

       137
       132
        
             ghc98 = compiler.ghc984;

     

       138
       133
        
             ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {

     
···

       151
       146
        
               # https://github.com/xattr/xattr/issues/44 and

     

       152
       147
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       153
       148
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       154
       154
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       155
       155
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       156
       156
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       149
       149
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       157
       150
        
             };

     

       158
       151
        
             ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {

     

       159
       152
        
               bootPkgs =

     
···

       171
       164
        
               # https://github.com/xattr/xattr/issues/44 and

     

       172
       165
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       173
       166
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       174
       174
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       175
       175
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       176
       176
       -
               llvmPackages = pkgs.llvmPackages_15;

     

       167
       167
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       177
       168
        
             };

     

       178
       169
        
             ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {

     

       179
       170
        
               bootPkgs =

     
···

       205
       196
        
               # https://github.com/xattr/xattr/issues/44 and

     

       206
       197
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       207
       198
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       208
       208
       -
               # 2024-12-21: Support range >= 13 && < 20

     

       209
       209
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;

     

       210
       210
       -
               llvmPackages = pkgs.llvmPackages_19;

     

       199
       199
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       211
       200
        
             };

     

       212
       201
        
             ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {

     

       213
       202
        
               bootPkgs =

     
···

       218
       207
        
               # https://github.com/xattr/xattr/issues/44 and

     

       219
       208
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       220
       209
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       221
       221
       -
               # 2024-12-21: Support range >= 13 && < 20

     

       222
       222
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;

     

       223
       223
       -
               llvmPackages = pkgs.llvmPackages_19;

     

       210
       210
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       224
       211
        
             };

     

       225
       212
        
             ghc912 = compiler.ghc9122;

     

       226
       213
        
             ghcHEAD = callPackage ../development/compilers/ghc/head.nix {

     
···

       230
       217
        
               # https://github.com/xattr/xattr/issues/44 and

     

       231
       218
        
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       232
       219
        
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       233
       233
       -
               # 2023-01-15: Support range >= 11 && < 16

     

       234
       234
       -
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_18;

     

       235
       235
       -
               llvmPackages = pkgs.llvmPackages_18;

     

       220
       220
       +
               inherit buildTargetLlvmPackages llvmPackages;

     

       236
       221
        
             };

     

       237
       222
        
       

     

       238
       223
        
             # Starting from GHC 9, integer-{simple,gmp} is replaced by ghc-bignum