diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 17:22:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 17:26:05 +0000 |
commit | fdbd1d8c86c5dfbdcf1ad454aed0f5b9da486612 (patch) | |
tree | a13528a3da57f4136d289778c958d4c22799c14b | |
parent | eb3598d2480ca6b2a22d7b280906acb113abddc8 (diff) | |
download | poky-fdbd1d8c86c5dfbdcf1ad454aed0f5b9da486612.tar.gz |
cmake: set system name correctly
For unknown reasons, the cmake class is using SDK_OS as the
target system OS. This makes no sense but only shows up as a problem
when you try a different SDK OS. Fix it to use TARGET_OS which is
the correct thing to do. For the vast majority of users this will
make no difference.
(From OE-Core master rev: 57be84259f0885865c85d7bac350979430b956b5)
(From OE-Core rev: 8a414086c04acb1c9387567a49f05577fa0d66ba)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/cmake.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index e64c30c412..4ef9fca820 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass | |||
@@ -35,7 +35,7 @@ cmake_do_generate_toolchain_file() { | |||
35 | cat > ${WORKDIR}/toolchain.cmake <<EOF | 35 | cat > ${WORKDIR}/toolchain.cmake <<EOF |
36 | # CMake system name must be something like "Linux". | 36 | # CMake system name must be something like "Linux". |
37 | # This is important for cross-compiling. | 37 | # This is important for cross-compiling. |
38 | set( CMAKE_SYSTEM_NAME `echo ${SDK_OS} | sed 's/^./\u&/'` ) | 38 | set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` ) |
39 | set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) | 39 | set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) |
40 | set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) | 40 | set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) |
41 | set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) | 41 | set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) |