gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rocmPackages.llvm: rename rocmcxx to rocm-toolchain

Browse Source 
Previous name was inaccurate.
This commit is contained in:
Luna Nova
2025-09-30 07:40:19 -07:00
parent e4020e3e6c
commit f633166ca7
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/rocm-modules/6/clr/default.nix
View File

@@ -13,6 +13,7 @@
rocm-device-libs, rocm-device-libs,
rocm-comgr, rocm-comgr,
rocm-runtime, rocm-runtime,
rocm-toolchain,
rocm-core, rocm-core,
roctracer, roctracer,
rocminfo, rocminfo,

12
pkgs/development/rocm-modules/6/llvm/default.nix
View File

@@ -71,7 +71,7 @@ let
stdenvToBuildRocmLlvm.cc stdenvToBuildRocmLlvm.cc
stdenvToBuildRocmLlvm.cc.cc stdenvToBuildRocmLlvm.cc.cc
]; ];
# A prefix for use as the GCC prefix when building rocmcxx # A prefix for use as the GCC prefix when building rocm-toolchain
gcc-prefix-headers = symlinkJoin { gcc-prefix-headers = symlinkJoin {
name = "gcc-prefix-headers"; name = "gcc-prefix-headers";
paths = [ paths = [
@@ -149,7 +149,7 @@ let
runCommand name runCommand name
{ {
# If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem # If this is erroring, try why-depends --precise on the symlinkJoin of inputs to look for the problem
# nix why-depends --precise .#rocmPackages.llvm.rocmcxx.linked /store/path/its/not/allowed # nix why-depends --precise .#rocmPackages.llvm.rocm-toolchain.linked /store/path/its/not/allowed
disallowedRequisites = disallowedRefsForToolchain; disallowedRequisites = disallowedRefsForToolchain;
passthru.linked = linked; passthru.linked = linked;
} }
@@ -384,7 +384,7 @@ rec {
(builtins.filter tablegenUsage old.cmakeFlags) (builtins.filter tablegenUsage old.cmakeFlags)
++ commonCmakeFlags ++ commonCmakeFlags
++ lib.optionals (!withLibcxx) [ ++ lib.optionals (!withLibcxx) [
# FIXME: Config file in rocmcxx instead of GCC_INSTALL_PREFIX? # FIXME: Config file in rocm-toolchain instead of GCC_INSTALL_PREFIX?
# Expected to be fully removed eventually # Expected to be fully removed eventually
"-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON" "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON"
"-DGCC_INSTALL_PREFIX=${gcc-prefix}" "-DGCC_INSTALL_PREFIX=${gcc-prefix}"
@@ -407,7 +407,7 @@ rec {
# A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path # A clang that understands standard include searching in a GNU sysroot and will put GPU libs in include path
# in the right order # in the right order
# and expects its libc to be in the sysroot # and expects its libc to be in the sysroot
rocmcxx = rocm-toolchain =
(sysrootCompiler clang-unwrapped "rocmcxx" ( (sysrootCompiler clang-unwrapped "rocmcxx" (
listUsefulOutputs ( listUsefulOutputs (
[ [
@@ -428,7 +428,7 @@ rec {
)) ))
// { // {
version = llvmMajorVersion; version = llvmMajorVersion;
cc = rocmcxx; cc = rocm-toolchain;
libllvm = llvm; libllvm = llvm;
isClang = true; isClang = true;
isGNU = false; isGNU = false;
@@ -460,7 +460,7 @@ rec {
}; };
}; };
clang = rocmcxx; clang = rocm-toolchain;
# Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects
# TODO(@LunNova): destroy this # TODO(@LunNova): destroy this

2
pkgs/development/rocm-modules/6/rocm-smi/default.nix
View File

@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py mv $out/libexec/rocm_smi/.rsmiBindings.py-wrapped $out/libexec/rocm_smi/rsmiBindings.py
'' ''
# workaround: propagate libdrm/ manually # workaround: propagate libdrm/ manually
# rocmcxx doesn't automatically add buildInputs to isystem include path like # rocm-toolchain doesn't automatically add buildInputs to isystem include path like
# wrapper based toolchains, cmake files often don't find_package(rocm-smi) so # wrapper based toolchains, cmake files often don't find_package(rocm-smi) so
# can't rely on cmake propagated interface # can't rely on cmake propagated interface
# upstream have been shipping libdrm copied into /opt/rocm # upstream have been shipping libdrm copied into /opt/rocm