patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

cmake: manual handling of CMakeCheckCompilerFlag.cmake inclusion

Browse source 
Fixes: #30232

This is a workaround for #30232.

During Zephyr CMake invocation a plain C compiler is used for DTS.
This results in the internal `CheckCompilerFlag.cmake` being included
by CMake

Later, when the full toolchain is configured, then
`CMakeCheckCompilerFlag.cmake` is included.
This overloads the `cmake_check_compiler_flag()` function, thus
causing #30232.

By manualy loading `CMakeCheckCompilerFlag.cmake` then
`CheckCompilerFlag.cmake` will overload the functions (and thus win the
battle), and because `include_guard(GLOBAL)` is used in
`CMakeCheckCompilerFlag.cmake` this file will not be re-included later.

It also prints a warning informing the user of the issue.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-11-26 22:02:19 +01:00 committed by Kumar Gala
parent 9028ecbc56
commit 6ca2bf25cb
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/app/boilerplate.cmake
View file

@ -71,6 +71,24 @@ set(__build_dir ${CMAKE_CURRENT_BINARY_DIR}/zephyr)
set(PROJECT_BINARY_DIR ${__build_dir})
if(${CMAKE_VERSION} VERSION_EQUAL 3.19.0 OR
${CMAKE_VERSION} VERSION_EQUAL 3.19.1)
message(WARNING "CMake 3.19.0/3.19.1 contains a bug regarding Toolchain/compiler "
"testing. Consider switching to a different CMake version.\n"
"See more here: \n"
"- https://github.com/zephyrproject-rtos/zephyr/issues/30232\n"
"- https://gitlab.kitware.com/cmake/cmake/-/issues/21497")
# This is a workaround for #30232.
# During Zephyr CMake invocation a plain C compiler is used for DTS.
# This results in the internal `CheckCompilerFlag.cmake` being included by CMake
# Later, when the full toolchain is configured, then `CMakeCheckCompilerFlag.cmake` is included.
# This overloads the `cmake_check_compiler_flag()` function, thus causing #30232.
# By manualy loading `CMakeCheckCompilerFlag.cmake` then `CheckCompilerFlag.cmake` will overload
# the functions (and thus win the battle), and because `include_guard(GLOBAL)` is used in
# `CMakeCheckCompilerFlag.cmake` this file will not be re-included later.
include(${CMAKE_ROOT}/Modules/Internal/CMakeCheckCompilerFlag.cmake)
endif()
message(STATUS "Application: ${APPLICATION_SOURCE_DIR}")
add_custom_target(code_data_relocation_target)