package/flare-engine: re-enable package on microblaze
With Microblaze Gcc version < 8.x the build hangs due to bug 85180: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180 To avoid this, the flare-engine package has a !BR2_TOOLCHAIN_HAS_GCC_BUG_85180 dependency. However, gcc bug 85180 only triggers when optimization is enabled, so we can work around the issue by passing -O0, which is what we do in other Buildroot packages to work around this bug. So, this commit passes -O0 when BR2_TOOLCHAIN_HAS_GCC_BUG_85180, and re-enables flare-engine on Microblaze. It is not enough to set CMAKE_CXX_FLAGS, because flare-engine's CMakeLists.txt sets CMAKE_CXX_FLAGS_<BUILD_TYPE> (depending on the value of CMAKE_BUILD_TYPE), and the build-type-specific flags come after the generic flags, so our -O0 gets overridden again. Therefore, also set CMAKE_BUILD_TYPE to the dummy value Buildroot. Fixes: http://autobuild.buildroot.net/results/706/7065e14917a8bbc0faf21b29183ac55b6c800ee3/ Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> [Arnout: extend explanatory comment and update commit log] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
910b431d63
commit
1203cca1b5
|
@ -2,7 +2,6 @@ config BR2_PACKAGE_FLARE_ENGINE
|
|||
bool "flare-engine"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_STATIC_LIBS # SDL2
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85180
|
||||
select BR2_PACKAGE_SDL2
|
||||
select BR2_PACKAGE_SDL2_IMAGE
|
||||
select BR2_PACKAGE_SDL2_MIXER
|
||||
|
@ -18,6 +17,3 @@ config BR2_PACKAGE_FLARE_ENGINE
|
|||
|
||||
comment "flare-engine needs a toolchain w/ C++, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
|
||||
|
||||
comment "flare-engine needs a toolchain not affected by GCC bug 85180"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85180
|
||||
|
|
|
@ -19,4 +19,12 @@ ifeq ($(BR2_ENABLE_DEBUG),y)
|
|||
FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
# CMakeLists.txt sets CMAKE_CXX_FLAGS_<BUILD_TYPE> depending on
|
||||
# BUILD_TYPE, and this comes after the generic CMAKE_CXX_FLAGS.
|
||||
# Overrice CMAKE_BUILD_TYPE so no overrides are applied.
|
||||
FLARE_ENGINE_CONF_OPTS += -DCMAKE_BUILD_TYPE=Buildroot
|
||||
FLARE_ENGINE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -O0"
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
|
Loading…
Reference in a new issue