diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-01-08 17:23:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-08 17:26:05 +0000 |
commit | da8a5ec9208a1716d3a1cdd87b1547cb00ff82e7 (patch) | |
tree | a941c9723c41d23b68777795882b1f0748b078e7 /meta/classes | |
parent | fdbd1d8c86c5dfbdcf1ad454aed0f5b9da486612 (diff) | |
download | poky-da8a5ec9208a1716d3a1cdd87b1547cb00ff82e7.tar.gz |
cmake.bbclass: ensure CMAKE_SYSTEM_NAME is correct
Using TARGET_OS can add the ABIEXTENSION so ensure that is is removed for the Linux
TARGET_OS, we might have other TARGET_OSes so don't hard code CMAKE_SYSTEM_NAME
[YOCTO #5145]
(From OE-Core master rev: 7d8b700242b1b32c6b6d0735b497701800f54fc4)
(From OE-Core rev: 5dc70fe4adfbc21426c461971e5a252233a015ba)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 4ef9fca820..5144cdf9c7 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 ${TARGET_OS} | sed 's/^./\u&/'` ) | 38 | set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` ) |
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} ) |