summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-07 23:25:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-08 10:51:56 +0100
commit31709ed0afe6e5254eabf7036fcf0f2228802dbb (patch)
treea74d84308aaf947f2a3f633df822de6059a2e44b
parent6bf67081380367b05080ab5518baacdddafd7c34 (diff)
downloadpoky-31709ed0afe6e5254eabf7036fcf0f2228802dbb.tar.gz
cmake: set system name correctly
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. (From OE-Core rev: 57be84259f0885865c85d7bac350979430b956b5) 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 8e579a7f9e..1e72371e76 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 ${SDK_OS} | sed 's/^./\u&/'` ) 38set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed 's/^./\u&/'` )
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} )