diff --git a/recipes-devtools/clang/libclc_git.bb b/recipes-devtools/clang/libclc_git.bb
index 2c4ed0a8..2315ab6d 100644
--- a/recipes-devtools/clang/libclc_git.bb
+++ b/recipes-devtools/clang/libclc_git.bb
@@ -15,19 +15,11 @@ DEPENDS += "qemu-native clang spirv-tools spirv-llvm-translator spirv-llvm-trans
 
 OECMAKE_SOURCEPATH = "${S}/libclc"
 
-EXTRA_OECMAKE += " \
-                                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                                -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
+EXTRA_OECMAKE += "\
+				-DLIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR=${STAGING_BINDIR_NATIVE} \
+                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 				-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
-				-DLLVM_CLANG=${STAGING_BINDIR_NATIVE}/clang \
-				-DLLVM_AS=${STAGING_BINDIR_NATIVE}/llvm-as \
-				-DLLVM_LINK=${STAGING_BINDIR_NATIVE}/llvm-link \
-				-DLLVM_OPT=${STAGING_BINDIR_NATIVE}/opt \
-				-DLLVM_SPIRV=${STAGING_BINDIR_NATIVE}/llvm-spirv \
-				-Dclc_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeCLCCompiler.cmake.in \
-				-Dll_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeLLAsmCompiler.cmake.in \
-				-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-			"
+				-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
 
 do_configure:prepend () {
 	# Write out a qemu wrapper that will be used by cmake