diff options
| author |   Jose Quaresma <quaresma.jose@gmail.com> | 2022-02-28 16:37:10 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-04 17:13:10 +0000 |
| commit | a83623a54a375d3ae9198a135b94379881a2b7a5 (patch) | |
| tree | 64bec392c4ad7b0b24df7ff2ee67a39575aa91d6 /meta/classes/cmake.bbclass | |
| parent | e591b462227ded84f3f8e7273200824ad63313c4 (diff) | |
| download | openembedded-core-a83623a54a375d3ae9198a135b94379881a2b7a5.tar.gz | |
Revert "cmake.bbclass: Set CXXFLAGS and CFLAGS"
This reverts commit 47594d59ec4ab82fcf87d3c590caf7c46a6bfdff.
This patch was introduced 5 years ago as a temporary workaround
to fix an upstream bug.
Currently with that patch the following flags are duplicated:
OECMAKE_C_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CFLAGS}"
OECMAKE_C_LINK_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CPPFLAGS} ${LDFLAGS}"
OECMAKE_CXX_LINK_FLAGS ?= "${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} ${CXXFLAGS} ${LDFLAGS}"
The duplicated flags is used in the toolchain.cmake:
set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "CFLAGS" )
set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" )
set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_CXX_LINK_FLAGS}" CACHE STRING "LDFLAGS" )
CC: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cmake.bbclass')
| -rw-r--r-- | meta/classes/cmake.bbclass | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index fac7bbca7a..d9bcddbdbb 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -31,8 +31,6 @@ 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}" def oecmake_map_compiler(compiler, d): args = d.getVar(compiler).split() |