diff --git a/projects/clr/rocclr/compiler/lib/complibdefs b/projects/clr/rocclr/compiler/lib/complibdefs
index 7fb916a83d..f1790bd645 100644
--- a/projects/clr/rocclr/compiler/lib/complibdefs
+++ b/projects/clr/rocclr/compiler/lib/complibdefs
@@ -1,5 +1,8 @@
+OPENCL_DEPTH ?= $(COMPLIB_DEPTH)/../..
+
 include $(OPENCL_DEPTH)/opencldefs
-COMPLIB_DEPTH = $(OPENCL_DEPTH)/compiler/lib
+
+ELFTOOLCHAIN_DIR = $(COMPLIB_DEPTH)/loaders/elf/utils
 
 ifdef GONE_TO_BUILD_DIR
 ifeq ($(BUILD_HSA_TARGET),yes)
diff --git a/projects/clr/rocclr/compiler/lib/complibrules b/projects/clr/rocclr/compiler/lib/complibrules
index 5c438132ad..495a6ed1e0 100644
--- a/projects/clr/rocclr/compiler/lib/complibrules
+++ b/projects/clr/rocclr/compiler/lib/complibrules
@@ -1,4 +1,4 @@
-COMPLIB_DEPTH = $(OPENCL_DEPTH)/compiler/lib
+COMPLIB_DEPTH ?= $(OPENCL_DEPTH)/compiler/lib
 ifdef GONE_TO_BUILD_DIR
 ifdef ATI_OS_LINUX
 *$(OBJ_EXT): $(COMPLIB_DEPTH)/complibdefs $(COMPLIB_DEPTH)/complibrules