this is fixing more than the workaround, e.g. see the patch I sent to fix libical, where these flags are not passed to git compiler when using cmake I am not sure how many such fallouts there will be through out.
On Mon, Feb 28, 2022 at 8:37 AM Jose Quaresma <[email protected]> wrote: > > 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 <[email protected]> > Signed-off-by: Jose Quaresma <[email protected]> > --- > meta/classes/cmake.bbclass | 2 -- > 1 file changed, 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() > -- > 2.35.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162524): https://lists.openembedded.org/g/openembedded-core/message/162524 Mute This Topic: https://lists.openembedded.org/mt/89454553/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
