diff options
| author | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-08 06:12:31 -0800 |
|---|---|---|
| committer | Rahul Butani <rrbutani@users.noreply.github.com> | 2023-01-27 13:29:20 -0800 |
| commit | 81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c (patch) | |
| tree | 66e525eeb00935b8440b0633b7778ea06f04bb6d /pkgs/development/compilers/llvm/15/default.nix | |
| parent | 201ef33028bbb02cbcb91eaaa6520157af71b412 (diff) | |
| download | nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar.gz nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar.bz2 nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar.lz nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar.xz nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.tar.zst nixpkgs-81ef82a029dfe2b67bf4fd306725ed3e3ed42a2c.zip | |
llvmPackages_15: apply some patches from `llvmPackages_14`
See #194634 for details. PRs: - #191372 - #190936 - #82131 - #199844 - #197674 - #184408 - #193004
Diffstat (limited to 'pkgs/development/compilers/llvm/15/default.nix')
| -rw-r--r-- | pkgs/development/compilers/llvm/15/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 3a1ba402ef6..26c0e239420 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -3,6 +3,7 @@ , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm # This is the default binutils, but with *this* version of LLD rather # than the default LLVM verion's, if LLD is the choice. We use these for # the `useLLVM` bootstrapping below. @@ -166,7 +167,7 @@ let ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional - (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) + (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; @@ -273,7 +274,7 @@ let }; openmp = callPackage ./openmp { - inherit llvm_meta; + inherit llvm_meta targetLlvm; }; }); |