[oe-commits] Saul Wold : cmake.bbclass: ensure CMAKE_SYSTEM_NAME is correct
git at git.openembedded.org
git at git.openembedded.org
Tue Sep 10 21:46:52 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 7d8b700242b1b32c6b6d0735b497701800f54fc4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7d8b700242b1b32c6b6d0735b497701800f54fc4
Author: Saul Wold <sgw at linux.intel.com>
Date: Tue Sep 10 10:28:15 2013 -0700
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]
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 1e72371..30c1792 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} )
More information about the Openembedded-commits
mailing list