summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
diff options
context:
space:
mode:
authorMartin Beeger <martin.beeger@online.de>2022-02-11 13:57:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-23 23:43:42 +0000
commit8d3efda87dc8c519c0031a9d6ee4199544be88d1 (patch)
tree16c4d31051e8777eaf36bc30653e1792f571aea6 /meta/recipes-devtools/cmake
parent7b27c85ed93cd6d193971a0d535bfa47454801f9 (diff)
downloadpoky-8d3efda87dc8c519c0031a9d6ee4199544be88d1.tar.gz
cmake: remove bogus CMAKE_LDFLAGS_FLAGS definition from toolchain file
As discussion in [YOCTO #14717] cmake contains a OEToolchainConfig.cmake file to configure the toolchain correctly in cross-compile build for recipes using cmake. The variable CMAKE_LDFLAGS_FLAGS is spelled incorrectly, cmake expects CMAKE_SHARED_LINKER_FLAGS, CMAKE_STATIC_LINKER_FLAGS, CMAKE_EXE_LINKER_FLAGS and CMAKE_MODULE_LINKER_FLAGS to be set instead. As cmake already correctly initializes these from environment there is no need to specify the linker flags in the toolchain file at all. So this just removes the variable, as its value was also set wrong. (From OE-Core rev: cf17fc284bcffe1d5b0797c733bcc2eb293a5d8f) Signed-off-by: Martin Beeger <martin.beeger@online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 52e59a5b37f55905ee693a99f9ffc34ed41b4283) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r--meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
index 398069eef2..f8af79ddd5 100644
--- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
+++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
@@ -2,7 +2,6 @@ set( CMAKE_SYSTEM_NAME Linux )
2set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) 2set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE )
3set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) 3set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE )
4set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) 4set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
5set( CMAKE_LDFLAGS_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE )
6set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) 5set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} )
7 6
8set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) 7set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} )