summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-09-10 10:28:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-10 22:58:33 +0100
commit5f2748e492ce4e21386ef122e6c747f9aa8a4322 (patch)
tree194fc2f4510082db33487108abbcd96ce3d65e3e
parent5992830145c55f5103b4ba24f98eeeae13c604fc (diff)
downloadpoky-5f2748e492ce4e21386ef122e6c747f9aa8a4322.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 rev: 7d8b700242b1b32c6b6d0735b497701800f54fc4) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cmake.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 1e72371e76..30c1792ffa 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.
38set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` ) 38set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
39set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} ) 39set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} )
40set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} ) 40set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
41set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) 41set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )