]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake: set system name correctly
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Jan 2014 17:22:59 +0000 (17:22 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Jan 2014 17:25:44 +0000 (17:25 +0000)
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 master rev: 57be84259f0885865c85d7bac350979430b956b5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/cmake.bbclass

index e64c30c412241ea834fe37f49576c48c53df18ca..4ef9fca820e8df9f0b0776acadd515c2f9b053df 100644 (file)
@@ -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} )