michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: compiler: gcc: Explicitly spell out stddef.h and limits.h

Browse source 
Depending on how compiler is built, it prints a different include
directory with `--print-file-name=include`.  What we want, instead, is
directories with `stddef.h` and `include-fixed/limits.h`.

This commit explicitly specify the header files we want to use, then
take the directory from the returned path.

Signed-off-by: Yasushi SHOJI <y-shoji@ispace-inc.com>
This commit is contained in:
Yasushi SHOJI 2019-05-09 14:00:06 +09:00 • committed by Carles Cufí
commit 209a9104be
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmake/compiler/clang/target.cmake
View file

@ -20,11 +20,12 @@ find_program(CMAKE_CXX_COMPILER clang++ ${find_program_clang_args})
if(NOT "${ARCH}" STREQUAL "posix") if(NOT "${ARCH}" STREQUAL "posix")
foreach(file_name include include-fixed) foreach(file_name include/stddef.h include-fixed/limits.h)
execute_process( execute_process(
COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name} COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
OUTPUT_VARIABLE _OUTPUT OUTPUT_VARIABLE _OUTPUT
) )
get_filename_component(_OUTPUT "${_OUTPUT}" DIRECTORY)
string(REGEX REPLACE "\n" "" _OUTPUT ${_OUTPUT}) string(REGEX REPLACE "\n" "" _OUTPUT ${_OUTPUT})
list(APPEND NOSTDINC ${_OUTPUT}) list(APPEND NOSTDINC ${_OUTPUT})

3
cmake/compiler/gcc/target.cmake
View file

@ -29,11 +29,12 @@ if(NOT DEFINED NOSYSDEF_CFLAG)
set(NOSYSDEF_CFLAG -undef) set(NOSYSDEF_CFLAG -undef)
endif() endif()
foreach(file_name include include-fixed) foreach(file_name include/stddef.h include-fixed/limits.h)
execute_process( execute_process(
COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name} COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
OUTPUT_VARIABLE _OUTPUT OUTPUT_VARIABLE _OUTPUT
) )
get_filename_component(_OUTPUT "${_OUTPUT}" DIRECTORY)
string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}") string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}")
list(APPEND NOSTDINC ${_OUTPUT}) list(APPEND NOSTDINC ${_OUTPUT})

3
cmake/compiler/host-gcc/target.cmake
View file

@ -60,11 +60,12 @@ if(NOT DEFINED NOSYSDEF_CFLAG)
set(NOSYSDEF_CFLAG -undef) set(NOSYSDEF_CFLAG -undef)
endif() endif()
foreach(file_name include) foreach(file_name include/stddef.h)
execute_process( execute_process(
COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name} COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
OUTPUT_VARIABLE _OUTPUT OUTPUT_VARIABLE _OUTPUT
) )
get_filename_component(_OUTPUT "${_OUTPUT}" DIRECTORY)
string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}") string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}")
list(APPEND NOSTDINC ${_OUTPUT}) list(APPEND NOSTDINC ${_OUTPUT})

3
cmake/compiler/xcc/target.cmake
View file

@ -29,11 +29,12 @@ if(NOT DEFINED NOSYSDEF_CFLAG)
set(NOSYSDEF_CFLAG -undef) set(NOSYSDEF_CFLAG -undef)
endif() endif()
foreach(file_name include include-fixed) foreach(file_name include/stddef.h include-fixed/limits.h)
execute_process( execute_process(
COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name} COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
OUTPUT_VARIABLE _OUTPUT OUTPUT_VARIABLE _OUTPUT
) )
get_filename_component(_OUTPUT "${_OUTPUT}" DIRECTORY)
string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}") string(REGEX REPLACE "\n" "" _OUTPUT "${_OUTPUT}")
list(APPEND NOSTDINC ${_OUTPUT}) list(APPEND NOSTDINC ${_OUTPUT})