michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: toolchain: llvm: Move the compiler assignment into 'compiler'

Browse source 
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 <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-12-10 15:08:59 +01:00 • committed by Kumar Gala
commit ab2139a90f
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmake/compiler/clang.cmake
View file

@ -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}

11
cmake/toolchain/llvm.cmake
View file

@ -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)