diff --git a/hipamd/src/CMakeLists.txt b/hipamd/src/CMakeLists.txt
index 07fb5d0f6f..c1346d4277 100644
--- a/hipamd/src/CMakeLists.txt
+++ b/hipamd/src/CMakeLists.txt
@@ -64,7 +64,7 @@ if(BUILD_SHARED_LIBS)
     add_custom_command(TARGET amdhip64 POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:amdhip64>)
   endif()
 else()
-  add_library(amdhip64 STATIC $<TARGET_OBJECTS:rocclr>)
+  add_library(amdhip64 STATIC rocclr)
 endif()
 
 set_target_properties(amdhip64 PROPERTIES
diff --git a/rocclr/cmake/ROCclr.cmake b/rocclr/cmake/ROCclr.cmake
index 0ef537771f..18ed07321a 100644
--- a/rocclr/cmake/ROCclr.cmake
+++ b/rocclr/cmake/ROCclr.cmake
@@ -40,7 +40,7 @@ find_package(Threads REQUIRED)
 
 find_package(AMD_OPENCL)
 
-add_library(rocclr OBJECT)
+add_library(rocclr STATIC)
 
 include(ROCclrCompilerOptions)