diff --git a/compiler/amd-llvm b/compiler/amd-llvm
index aa451e1fe6a..4fe37e2ab0c 160000
--- a/compiler/amd-llvm
+++ b/compiler/amd-llvm
@@ -1 +1 @@
-Subproject commit aa451e1fe6a793394d6733051b1778633063ae96
+Subproject commit 4fe37e2ab0cb24b34b135b12f6b93d84394fde7b
diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt
index b9020e91fb9..4bf63216ef6 100644
--- a/math-libs/BLAS/CMakeLists.txt
+++ b/math-libs/BLAS/CMakeLists.txt
@@ -7,6 +7,19 @@
 # here without worrying about build deps.
 therock_cmake_subproject_dist_dir(_blas_hack_hip_dir hip-clr)
 cmake_path(APPEND _blas_hack_hip_dir lib/llvm OUTPUT_VARIABLE _toolchain_dir)
+set(_blas_hip_clang_root_cmake_args)
+if(NOT WIN32)
+  list(APPEND _blas_hip_clang_root_cmake_args
+    "-DHIP_CLANG_ROOT=${_toolchain_dir}"
+  )
+endif()
+set(_blas_openmp_toolchain_cmake_args)
+if(NOT WIN32)
+  list(APPEND _blas_openmp_toolchain_cmake_args
+    "-DOpenMP_DIR=${_toolchain_dir}/lib/cmake/openmp"
+    ${_blas_hip_clang_root_cmake_args}
+  )
+endif()
 
 # Most libraries need to depend on the profiler, but is conditionally only used
 # on Posix.
@@ -189,6 +202,7 @@ set(rocBLAS_extra_cmake_args)
 if(THEROCK_BUILD_TESTING)
   list(APPEND rocBLAS_extra_cmake_args -DROCBLAS_CLIENTS_REFERENCE_ILP64=ON)
 endif()
+list(APPEND rocBLAS_extra_cmake_args ${_blas_openmp_toolchain_cmake_args})
 
 # Disable rocBLAS samples on Windows due to use of deprecated
 # <experimental/filesystem> in client_utility.cpp with MSVC.
@@ -265,6 +279,7 @@ if(THEROCK_ENABLE_SPARSE)
       -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING}
       -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING}
       -DBUILD_CLIENTS_SAMPLES=OFF
+      ${_blas_hip_clang_root_cmake_args}
     CMAKE_INCLUDES
       therock_explicit_finders.cmake
     COMPILER_TOOLCHAIN
@@ -305,6 +320,7 @@ if(THEROCK_ENABLE_SPARSE)
       -DBUILD_CLIENTS_TESTS=${THEROCK_BUILD_TESTING}
       -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING}
       -DBUILD_CLIENTS_SAMPLES=OFF
+      ${_blas_openmp_toolchain_cmake_args}
     COMPILER_TOOLCHAIN
       amd-hip
     BUILD_DEPS
@@ -351,6 +367,7 @@ if(THEROCK_ENABLE_SPARSE)
         -DHIPSPARSELT_ENABLE_SAMPLES=OFF
         -DHIPSPARSELT_ENABLE_FETCH=OFF
         -DHIPSPARSELT_ENABLE_THEROCK=ON
+        ${_blas_hip_clang_root_cmake_args}
       COMPILER_TOOLCHAIN
         amd-hip
       BUILD_DEPS
@@ -500,6 +517,7 @@ therock_cmake_subproject_declare(hipBLAS
     -DBUILD_CLIENTS_BENCHMARKS=${THEROCK_BUILD_TESTING}
     -DBUILD_CLIENTS_SAMPLES=OFF
     -DLINK_BLIS=OFF
+    ${_blas_openmp_toolchain_cmake_args}
   COMPILER_TOOLCHAIN
     amd-hip
   BUILD_DEPS
diff --git a/rocm-systems b/rocm-systems
index 435195a1d73..8e1ee991ebe 160000
--- a/rocm-systems
+++ b/rocm-systems
@@ -1 +1 @@
-Subproject commit 435195a1d732e8e615bd885aa206dc8e9683ea11
+Subproject commit 8e1ee991ebea976c5a473624482538f5628af33c
diff --git a/third-party/sysdeps/common/sqlite3/CMakeLists.txt b/third-party/sysdeps/common/sqlite3/CMakeLists.txt
index e8b7b13855b..b0f8fa563a9 100644
--- a/third-party/sysdeps/common/sqlite3/CMakeLists.txt
+++ b/third-party/sysdeps/common/sqlite3/CMakeLists.txt
@@ -33,6 +33,8 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
         "-DSQLITE3_VERSION=${SQLITE3_VERSION}"
       INSTALL_DESTINATION
         lib/rocm_sysdeps
+      INTERFACE_INCLUDE_DIRS
+        lib/rocm_sysdeps/include
       INTERFACE_LINK_DIRS
         lib/rocm_sysdeps/lib
       INTERFACE_PKG_CONFIG_DIRS