diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.4.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.4.1.ebuild
index b5d21c519d4fa..a2ce9ce18ae01 100644
--- a/sci-libs/hipBLASLt/hipBLASLt-6.4.1.ebuild
+++ b/sci-libs/hipBLASLt/hipBLASLt-6.4.1.ebuild
@@ -90,11 +90,14 @@ src_prepare() {
 	local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die))
 	python_fix_shebang -q ${shebangs[*]}
 
-	sed -e "s:\${rocm_path}/bin/amdclang++:$(get_llvm_prefix)/bin/clang++:" \
+	rocm_use_clang
+	sed -e "s:\${rocm_path}/bin/amdclang++:${CXX}:" \
 		-i library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh \
 		-i tensilelite/Tensile/Ops/gen_assembly.sh || die
 
-	sed 's/amdclang/clang/g' -i tensilelite/Tensile/Utilities/Toolchain.py || die
+	# Fix compiler validation (just a validation)
+	sed "s/amdclang/$(basename "$CC")/g" \
+		-i tensilelite/Tensile/Utilities/Toolchain.py || die
 
 	cmake_src_prepare
 }