[oe-commits] [openembedded-core] 09/09: cmake.bbclass: Set CMAKE_CROSSCOMPILING correctly

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit bd082c9be6191e67ea1b1bf10ce5e130a3433ab5
Author: Kyle Russell <bkylerussell at gmail.com>
AuthorDate: Tue Apr 18 11:36:05 2017 -0400

    cmake.bbclass: Set CMAKE_CROSSCOMPILING correctly
    
    If CMAKE_SYSTEM_NAME is defined, CMake assumes we're cross-compiling,
    which is not necessarily the case.
    
    Signed-off-by: Kyle Russell <bkylerussell at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/cmake.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 9e74599..3f67091 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -42,9 +42,13 @@ def map_target_arch_to_uname_arch(target_arch):
     return target_arch
 
 cmake_do_generate_toolchain_file() {
+	if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
+	    CMAKE_CROSSCOMPILING="set( CMAKE_CROSSCOMPILING FALSE )"
+	fi
 	cat > ${WORKDIR}/toolchain.cmake <<EOF
 # CMake system name must be something like "Linux".
 # This is important for cross-compiling.
+${CMAKE_CROSSCOMPILING}
 set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
 set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH'))} )
 set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.