diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-01-23 17:17:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-26 13:39:37 +0000 |
commit | 7ea988887c577aa6c62bdada8db7218d852d9edd (patch) | |
tree | d090e9e07c2ef5e18daab96ab8142218b2696188 /meta | |
parent | 32309ba1de62aca484170a61c25cb595cc91812a (diff) | |
download | poky-7ea988887c577aa6c62bdada8db7218d852d9edd.tar.gz |
cmake: do not look into native sysroot in the nativesdk environment
I am not sure why we do this in the first place, but it is causing
cmake to erroneously pick up items from the native sysroot
when building for the target and the target item is missing, for example:
https://autobuilder.yoctoproject.org/typhoon/#/builders/59/builds/198/steps/7/logs/step2c
Note that for executable programs this variable is not referred to,
as set by
set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER )
in the same file.
(From OE-Core rev: cd1c0a0631ad128b25e97f047750579caead051a)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index 8a0fb4cb12..398069eef2 100644 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | |||
@@ -5,7 +5,7 @@ set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) | |||
5 | set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) | 5 | set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE ) |
6 | set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) | 6 | set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) |
7 | 7 | ||
8 | set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} $ENV{OECORE_NATIVE_SYSROOT} ) | 8 | set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) |
9 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) | 9 | set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER ) |
10 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) | 10 | set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) |
11 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) | 11 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) |