Patchwork cmake: set system name correctly

login
register
mail settings
Submitter Richard Purdie
Date Sept. 7, 2013, 10:25 p.m.
Message ID <1378592714.3484.49.camel@ted>
Download mbox | patch
Permalink /patch/57623/
State Accepted
Commit 31709ed0afe6e5254eabf7036fcf0f2228802dbb
Headers show

Comments

Richard Purdie - Sept. 7, 2013, 10:25 p.m.
For unknown reasons, the cmake class is using SDK_OS as the
target system OS. This makes no sense but only shows up as a problem
when you try a different SDK OS. Fix it to use TARGET_OS which is
the correct thing to do. For the vast majority of users this will
make no difference.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 8e579a7..1e72371 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 ${SDK_OS} | sed 's/^./\u&/'` )
+set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` )
 set( CMAKE_SYSTEM_PROCESSOR ${TARGET_ARCH} )
 set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
 set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )