diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2024-12-21 18:27:54 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2024-12-22 14:47:55 +0100 |
| commit | 0872290b7f7356a971eaea3ceb2e83ffe107125d (patch) | |
| tree | 322b7d235ed8a5f95489476f9e6fe2d055044374 | |
| parent | Finally gcc_offload built (diff) | |
| download | nixpkgs-origin/gcc-offload.tar.gz | |
Change llvm packages for gcc offloadorigin/gcc-offload
| -rw-r--r-- | pkgs/development/compilers/gcc/common/dependencies.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index f679ca35064c..89ccdb66e4f5 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -34,14 +34,17 @@ let ## llvm18 fails with gcc <14 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114419 - llvmAmd = buildPackages.runCommand "${buildPackages.llvm.name}-wrapper" {} '' - mkdir -p $out/bin - for a in ar nm ranlib; do - ln -s ${buildPackages.llvmPackages.llvm}/bin/llvm-$a $out/bin/amdgcn-amdhsa-$a - done - ln -s ${buildPackages.llvmPackages.llvm}/bin/llvm-mc $out/bin/amdgcn-amdhsa-as - ln -s ${buildPackages.llvmPackages.lld}/bin/lld $out/bin/amdgcn-amdhsa-ld - ''; + llvmAmd = + let + llvm = buildPackages.llvmPackages_19; + in buildPackages.runCommand "${llvm.llvm.name}-wrapper" {} '' + mkdir -p $out/bin + for a in ar nm ranlib; do + ln -s ${llvm.llvm}/bin/llvm-$a $out/bin/amdgcn-amdhsa-$a + done + ln -s ${llvm.llvm}/bin/llvm-mc $out/bin/amdgcn-amdhsa-as + ln -s ${llvm.lld}/bin/lld $out/bin/amdgcn-amdhsa-ld + ''; in { |