From: Saul Wold <sgw@linux.intel.com>
Date: Tue, 10 Sep 2013 17:28:15 +0000 (-0700)
Subject: cmake.bbclass: ensure CMAKE_SYSTEM_NAME is correct
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f2748e492ce4e21386ef122e6c747f9aa8a4322;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 1e72371e760..30c1792ffa6 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -35,7 +35,7 @@ cmake_do_generate_toolchain_file() {
 	cat > ${WORKDIR}/toolchain.cmake <<EOF
 # CMake system name must be something like "Linux".
 # This is important for cross-compiling.
-set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` )
+set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
 set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} )
 set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
 set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )