cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rocmPackages_5: pin stdenv to GCC 12

Browse source 
Try reverting this on a future ROCm release.

Addresses: https://github.com/NixOS/nixpkgs/issues/271943
This commit is contained in:
Madoura 2023-12-03 18:25:44 -06:00 committed by Adam Joseph
parent 66e212555d
commit 93ebe44ac3
6 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/rocm-modules/5/default.nix
View file

@ -1,4 +1,5 @@
{ callPackage
{ gcc12Stdenv # FIXME: Try removing this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943
, callPackage
, recurseIntoAttrs
, symlinkJoin
, fetchFromGitHub
@ -73,10 +74,11 @@ in rec {
# Broken, too many errors
rdc = callPackage ./rdc {
inherit rocmUpdateScript rocm-smi rocm-runtime;
stdenv = gcc12Stdenv;
# stdenv = llvm.rocmClangStdenv;
};
rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { };
rocm-docs-core = python3Packages.callPackage ./rocm-docs-core { stdenv = gcc12Stdenv; };
## ROCm-Developer-Tools ##
hip-common = callPackage ./hip-common {
@ -107,17 +109,20 @@ in rec {
rocprofiler = callPackage ./rocprofiler {
inherit rocmUpdateScript clr rocm-core rocm-thunk rocm-device-libs roctracer rocdbgapi rocm-smi hsa-amd-aqlprofile-bin;
inherit (llvm) clang;
stdenv = gcc12Stdenv;
};
# Needs GCC
roctracer = callPackage ./roctracer {
inherit rocmUpdateScript rocm-device-libs rocm-runtime clr;
stdenv = gcc12Stdenv;
};
# Needs GCC
rocgdb = callPackage ./rocgdb {
inherit rocmUpdateScript;
elfutils = elfutils.override { enableDebuginfod = true; };
stdenv = gcc12Stdenv;
};
rocdbgapi = callPackage ./rocdbgapi {

17
pkgs/development/rocm-modules/5/llvm/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv
{ # stdenv FIXME: Try changing back to this with a new ROCm release https://github.com/NixOS/nixpkgs/issues/271943
gcc12Stdenv
, callPackage
, rocmUpdateScript
, wrapBintoolsWith
@ -12,18 +13,18 @@
let
## Stage 1 ##
# Projects
llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; };
clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; };
lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; };
llvm = callPackage ./stage-1/llvm.nix { inherit rocmUpdateScript; stdenv = gcc12Stdenv; };
clang-unwrapped = callPackage ./stage-1/clang-unwrapped.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; };
lld = callPackage ./stage-1/lld.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; };
# Runtimes
runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; };
runtimes = callPackage ./stage-1/runtimes.nix { inherit rocmUpdateScript llvm; stdenv = gcc12Stdenv; };
## Stage 2 ##
# Helpers
bintools-unwrapped = callPackage ./stage-2/bintools-unwrapped.nix { inherit llvm lld; };
bintools = wrapBintoolsWith { bintools = bintools-unwrapped; };
rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; };
rStdenv = callPackage ./stage-2/rstdenv.nix { inherit llvm clang-unwrapped lld runtimes bintools; stdenv = gcc12Stdenv; };
in rec {
inherit
llvm
@ -40,8 +41,8 @@ in rec {
## Stage 3 ##
# Helpers
clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; };
rocmClangStdenv = overrideCC stdenv clang;
clang = callPackage ./stage-3/clang.nix { inherit llvm lld clang-unwrapped bintools libc libunwind libcxxabi libcxx compiler-rt; stdenv = gcc12Stdenv; };
rocmClangStdenv = overrideCC gcc12Stdenv clang;
# Projects
clang-tools-extra = callPackage ./stage-3/clang-tools-extra.nix { inherit rocmUpdateScript llvm clang-unwrapped; stdenv = rocmClangStdenv; };

5
pkgs/development/rocm-modules/5/llvm/stage-1/clang-unwrapped.nix
View file

@ -1,10 +1,11 @@
{ callPackage
{ stdenv
, callPackage
, rocmUpdateScript
, llvm
}:
callPackage ../base.nix rec {
inherit rocmUpdateScript;
inherit stdenv rocmUpdateScript;
targetName = "clang-unwrapped";
targetDir = "clang";
extraBuildInputs = [ llvm ];

5
pkgs/development/rocm-modules/5/llvm/stage-1/lld.nix
View file

@ -1,10 +1,11 @@
{ callPackage
{ stdenv
, callPackage
, rocmUpdateScript
, llvm
}:
callPackage ../base.nix rec {
inherit rocmUpdateScript;
inherit stdenv rocmUpdateScript;
buildMan = false; # No man pages to build
targetName = "lld";
targetDir = targetName;

2
pkgs/development/rocm-modules/5/llvm/stage-1/llvm.nix
View file

@ -4,7 +4,7 @@
}:
callPackage ../base.nix {
inherit rocmUpdateScript;
inherit stdenv rocmUpdateScript;
requiredSystemFeatures = [ "big-parallel" ];
isBroken = stdenv.isAarch64; # https://github.com/RadeonOpenCompute/ROCm/issues/1831#issuecomment-1278205344
}

3
pkgs/development/rocm-modules/5/llvm/stage-1/runtimes.nix
View file

@ -1,11 +1,12 @@
{ lib
, stdenv
, callPackage
, rocmUpdateScript
, llvm
}:
callPackage ../base.nix rec {
inherit rocmUpdateScript;
inherit stdenv rocmUpdateScript;
buildDocs = false;
buildMan = false;
buildTests = false;