From ab2139a90f2f4745e08fa532f424f8620ddfa2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Mon, 10 Dec 2018 15:08:59 +0100 Subject: [PATCH] cmake: toolchain: llvm: Move the compiler assignment into 'compiler' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Align 'clang' with gcc by having it also set CMAKE_C_COMPILER in the 'compiler' build script instead of the 'toolchain' build script. Signed-off-by: Sebastian Bøe --- cmake/compiler/clang.cmake | 10 ++++++++++ cmake/toolchain/llvm.cmake | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cmake/compiler/clang.cmake b/cmake/compiler/clang.cmake index d43dbdfa1b7..eca694a49a0 100644 --- a/cmake/compiler/clang.cmake +++ b/cmake/compiler/clang.cmake @@ -9,6 +9,16 @@ if(NOT DEFINED NOSYSDEF_CFLAG) set(NOSYSDEF_CFLAG -undef) endif() +set(CMAKE_C_COMPILER ${CLANG_ROOT}/bin/clang) +set(CMAKE_CXX_COMPILER ${CLANG_ROOT}/bin/clang++) +set(CMAKE_AR ${CLANG_ROOT}/bin/llvm-ar CACHE INTERNAL " " FORCE) +set(CMAKE_LINKER ${CLANG_ROOT}/bin/llvm-link CACHE INTERNAL " " FORCE) +set(CMAKE_NM ${CLANG_ROOT}/bin/llvm-nm CACHE INTERNAL " " FORCE) +set(CMAKE_OBJDUMP ${CLANG_ROOT}/bin/llvm-objdump CACHE INTERNAL " " FORCE) +set(CMAKE_RANLIB ${CLANG_ROOT}/bin/llvm-ranlib CACHE INTERNAL " " FORCE) +set(CMAKE_OBJCOPY objcopy CACHE INTERNAL " " FORCE) +set(CMAKE_READELF readelf CACHE INTERNAL " " FORCE) + foreach(file_name include include-fixed) execute_process( COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name} diff --git a/cmake/toolchain/llvm.cmake b/cmake/toolchain/llvm.cmake index fe682f29009..a67845924d7 100644 --- a/cmake/toolchain/llvm.cmake +++ b/cmake/toolchain/llvm.cmake @@ -1,5 +1,6 @@ set(CLANG_ROOT $ENV{CLANG_ROOT_DIR}) set_ifndef(CLANG_ROOT /usr) + set(COMPILER clang) if("${ARCH}" STREQUAL "arm") @@ -9,16 +10,6 @@ elseif("${ARCH}" STREQUAL "x86") set(triple i686-pc-none-elf) endif() -set(CMAKE_C_COMPILER ${CLANG_ROOT}/bin/clang) set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_ASM_COMPILER_TARGET ${triple}) -set(CMAKE_CXX_COMPILER ${CLANG_ROOT}/bin/clang++) set(CMAKE_CXX_COMPILER_TARGET ${triple}) -set(CMAKE_AR "${CLANG_ROOT}/bin/llvm-ar" CACHE INTERNAL " " FORCE) -set(CMAKE_LINKER "${CLANG_ROOT}/bin/llvm-link" CACHE INTERNAL " " FORCE) -SET(CMAKE_NM "${CLANG_ROOT}/bin/llvm-nm" CACHE INTERNAL " " FORCE) -SET(CMAKE_OBJDUMP "${CLANG_ROOT}/bin/llvm-objdump" CACHE INTERNAL " " FORCE) -SET(CMAKE_RANLIB "${CLANG_ROOT}/bin/llvm-ranlib" CACHE INTERNAL " " FORCE) -set(CMAKE_OBJCOPY objcopy CACHE INTERNAL " " FORCE) -set(CMAKE_READELF readelf CACHE INTERNAL " " FORCE) -