1 files changed, 4 insertions, 6 deletions

diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index cb0d200..d91a32a 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -94,14 +94,12 @@ OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
 OVERRIDES =. "${@['', 'runtime-${RUNTIME}:']['${RUNTIME}' != '']}"
 OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME"
 
-YOCTO_ALTERNATE_EXE_PATH[export] = "0"
-YOCTO_ALTERNATE_LIBDIR[export] = "0"
 
-YOCTO_ALTERNATE_EXE_PATH:class-target = "${STAGING_BINDIR}/llvm-config"
-YOCTO_ALTERNATE_LIBDIR:class-target = "${base_libdir}"
+YOCTO_ALTERNATE_EXE_PATH:toolchain-clang:class-target = "${STAGING_BINDIR}/llvm-config"
+YOCTO_ALTERNATE_LIBDIR:toolchain-clang:class-target = "${base_libdir}"
 
-YOCTO_ALTERNATE_EXE_PATH:class-target[export] = "1"
-YOCTO_ALTERNATE_LIBDIR:class-target[export] = "1"
+#YOCTO_ALTERNATE_EXE_PATH:toolchain-clang:class-target[export] = "1"
+#YOCTO_ALTERNATE_LIBDIR:toolchain-clang:class-target[export] = "1"
 
 #DEPENDS:append:toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
 #DEPENDS:remove:toolchain-clang:allarch = "clang-cross-${TARGET_ARCH}"