diff --git a/projects/clr/rocclr/device/pal/palkernel.cpp b/projects/clr/rocclr/device/pal/palkernel.cpp
index 2ca8c367e4..1069a2a2c2 100644
--- a/projects/clr/rocclr/device/pal/palkernel.cpp
+++ b/projects/clr/rocclr/device/pal/palkernel.cpp
@@ -86,6 +86,7 @@ bool HSAILKernel::setKernelCode(amd::hsa::loader::Symbol* sym, amd_kernel_code_t
 }
 
 bool HSAILKernel::aqlCreateHWInfo() {
+#if defined(WITH_COMPILER_LIB)
   hsa_agent_t agent = {amd::Device::toHandle(&(device()))};
   std::string openclKernelName = device::Kernel::openclMangledName(name());
   amd::hsa::loader::Symbol* sym = prog().getSymbol(openclKernelName.c_str(), &agent);
@@ -114,7 +115,7 @@ bool HSAILKernel::aqlCreateHWInfo() {
 
   workgroupGroupSegmentByteSize_ = workGroupInfo_.usedLDSSize_;
   kernargSegmentByteSize_ = akc->kernarg_segment_byte_size;
-
+#endif // defined(WITH_COMPILER_LIB)
   return true;
 }
 
@@ -134,7 +135,7 @@ bool HSAILKernel::postLoad() {
   if (!aqlCreateHWInfo()) {
     return false;
   }
-#endif
+#endif // defined(WITH_COMPILER_LIB)
   return true;
 }
 
diff --git a/projects/clr/rocclr/device/pal/palprogram.cpp b/projects/clr/rocclr/device/pal/palprogram.cpp
index 81329e85c8..4982d6a029 100644
--- a/projects/clr/rocclr/device/pal/palprogram.cpp
+++ b/projects/clr/rocclr/device/pal/palprogram.cpp
@@ -245,6 +245,7 @@ inline static std::vector<std::string> splitSpaceSeparatedString(char* str) {
 
 bool HSAILProgram::createKernels(void* binary, size_t binSize, bool useUniformWorkGroupSize,
                                  bool internalKernel) {
+#if defined(WITH_COMPILER_LIB)
   size_t kernelNamesSize = 0;
   acl_error errorCode = amd::Hsail::QueryInfo(palNullDevice().compiler(), binaryElf_,
     RT_KERNEL_NAMES, nullptr, nullptr, &kernelNamesSize);
@@ -277,6 +278,7 @@ bool HSAILProgram::createKernels(void* binary, size_t binSize, bool useUniformWo
       aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
     }
   }
+#endif  // defined(WITH_COMPILER_LIB)
   return true;
 }