On 5/14/19 8:04 AM, Nikolai Merinov wrote:
The CMake takes mandatory compiler arguments from the following variables: - CMAKE_SYSROOT -- path to sysroot that should be passed to compiler. - CMAKE_<LANG>_COMPILER_TARGET -- target architecture, used for compilers that supports several targets through command line options. e.g. "clang --target ${CMAKE_C_COMPILER_TARGET}". - CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN -- path to external toolchain, used for compilers that support build with external toolchain. e.g. "clang --gcc-toolchain ${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}". - CMAKE_<LANG>_COMPILER_ARG1 -- other mandatory arguments to a compiler command. CMAKE_<LANG>_COMPILER_ARG1 is the most suitable variable to pass mandatory arguments, that belongs to CC variable with other build systems, to a compiler. Additionally usage of CMAKE_<LANG>_COMPILER_ARG1 instead of CMAKE_<LANG>_FLAGS reduce the risk that a variable can be overrided by CMakeLists.txt files. --- meta/classes/cmake.bbclass | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index d3f0d70847..4da4c00a09 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -27,27 +27,33 @@ python() { cc_list = d.getVar('CC').split() if cc_list[0] == 'ccache': d.setVar('OECMAKE_C_COMPILER', '%s %s' % (cc_list[0], cc_list[1])) + cc_arg1 = ' '.join(cc_list[2:]) else: d.setVar('OECMAKE_C_COMPILER', cc_list[0]) + cc_arg1 = ' '.join(cc_list[1:]) + if not d.getVar('OECMAKE_C_COMPILER_ARG1'): + d.setVar('OECMAKE_C_COMPILER_ARG1', cc_arg1)if not d.getVar('OECMAKE_CXX_COMPILER'):cxx_list = d.getVar('CXX').split() if cxx_list[0] == 'ccache': d.setVar('OECMAKE_CXX_COMPILER', '%s %s' % (cxx_list[0], cxx_list[1])) + cxx_arg1 = ' '.join(cxx_list[2:]) else: d.setVar('OECMAKE_CXX_COMPILER', cxx_list[0]) + cxx_arg1 = ' '.join(cxx_list[1:]) + if not d.getVar('OECMAKE_CXX_COMPILER_ARG1'): + d.setVar('OECMAKE_CXX_COMPILER_ARG1', cxx_arg1) } OECMAKE_AR ?= "${AR}"# Compiler flags-OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}" -OECMAKE_CXX_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CXXFLAGS}" +OECMAKE_C_FLAGS ?= "${CFLAGS}" +OECMAKE_CXX_FLAGS ?= "${CXXFLAGS}" OECMAKE_C_FLAGS_RELEASE ?= "-DNDEBUG" OECMAKE_CXX_FLAGS_RELEASE ?= "-DNDEBUG" -OECMAKE_C_LINK_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CPPFLAGS} ${LDFLAGS}" -OECMAKE_CXX_LINK_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CXXFLAGS} ${LDFLAGS}" -CXXFLAGS += "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}" -CFLAGS += "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS}" +OECMAKE_C_LINK_FLAGS ?= "${CPPFLAGS} ${LDFLAGS}" +OECMAKE_CXX_LINK_FLAGS ?= "${CXXFLAGS} ${LDFLAGS}"OECMAKE_RPATH ?= ""OECMAKE_PERLNATIVE_DIR ??= "" @@ -85,8 +91,11 @@ $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} ) +set( CMAKE_C_COMPILER_ARG1 "${OECMAKE_C_COMPILER_ARG1}" ) set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} ) +set( CMAKE_CXX_COMPILER_ARG1 "${OECMAKE_CXX_COMPILER_ARG1}" ) set( CMAKE_ASM_COMPILER ${OECMAKE_C_COMPILER} ) +set( CMAKE_ASM_COMPILER_ARG1 "${OECMAKE_C_COMPILER_ARG1}" ) set( CMAKE_AR ${OECMAKE_AR} CACHE FILEPATH "Archiver" ) set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "CFLAGS" ) set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" )
these changes look ok, have you also tried building SDK and see if these changes are reflected in SDK as well ?
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
