From 03de10091aa79c1a79b05c3ff1a14bd150245963 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 29 Oct 2020 08:53:01 -0400 Subject: [PATCH] clang: use LLVM_TOOLCHAIN_PATH instead of CLANG_ROOT_DIR Be consistent with other toolchains. Signed-off-by: Anas Nashif --- cmake/toolchain/llvm/generic.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/toolchain/llvm/generic.cmake b/cmake/toolchain/llvm/generic.cmake index 405d511094e..6739b34cc0a 100644 --- a/cmake/toolchain/llvm/generic.cmake +++ b/cmake/toolchain/llvm/generic.cmake @@ -1,9 +1,13 @@ # SPDX-License-Identifier: Apache-2.0 -if(DEFINED $ENV{CLANG_ROOT_DIR}) - set(TOOLCHAIN_HOME ${CLANG_ROOT}/bin/) +set_ifndef(LLVM_TOOLCHAIN_PATH "$ENV{CLANG_ROOT_DIR}") +set_ifndef(LLVM_TOOLCHAIN_PATH "$ENV{LLVM_TOOLCHAIN_PATH}") +if(LLVM_TOOLCHAIN_PATH) + set(TOOLCHAIN_HOME ${LLVM_TOOLCHAIN_PATH}/bin/) endif() +set(LLVM_TOOLCHAIN_PATH ${CLANG_ROOT_DIR} CACHE PATH "clang install directory") + set(COMPILER clang) set(LINKER ld) # TODO: Use lld eventually rather than GNU ld set(BINTOOLS llvm)