diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 939c236c56dc..fc71bed2bf39 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -41,7 +41,7 @@ let inherit (self) rocm-device-libs; } ); - inherit (self.llvm) rocm-merged-llvm clang openmp; + inherit (self.llvm) rocm-toolchain clang openmp; rocm-core = self.callPackage ./rocm-core { stdenv = origStdenv; }; diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index 8b54aeade9a8..e35b4f353270 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -462,44 +462,6 @@ rec { clang = rocm-toolchain; - # Emulate a monolithic ROCm LLVM build to support building ROCm's in-tree LLVM projects - # TODO(@LunNova): destroy this - rocm-merged-llvm = symlinkJoin { - name = "rocm-llvm-merge"; - paths = [ - llvm - llvm.dev - lld - lld.lib - lld.dev - compiler-rt - compiler-rt.dev - rocmcxx - ] - ++ lib.optionals withLibcxx [ - libcxx - libcxx.out - libcxx.dev - ]; - postBuild = builtins.unsafeDiscardStringContext '' - found_files=$(find $out -name '*.cmake') - if [ -z "$found_files" ]; then - >&2 echo "Error: No CMake files found in $out" - exit 1 - fi - - for target in ${clang-unwrapped.out} ${clang-unwrapped.lib} ${clang-unwrapped.dev}; do - if grep "$target" $found_files; then - >&2 echo "Unexpected ref to $target (clang-unwrapped) found" - # exit 1 - # # FIXME: enable this to reduce closure size - fi - done - ''; - inherit version; - llvm-src = llvmSrc; - }; - rocmClangStdenv = overrideCC ( if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv ) clang;