Patchwork [dylan,2/2] cmake.bbclass: ensure CMAKE_SYSTEM_NAME is correct

login
register
mail settings
Submitter Paul Eggleton
Date Jan. 8, 2014, 5:23 p.m.
Message ID <d5afbc6d29c28e77fdfb98bff9d099806460a160.1389201662.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/64439/
State New
Headers show

Comments

Paul Eggleton - Jan. 8, 2014, 5:23 p.m.
From: Saul Wold <sgw@linux.intel.com>

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)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 4ef9fca..5144cdf 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} )