diff --git a/package/flann/Config.in b/package/flann/Config.in
index a2cd50c867..3725fc784f 100644
--- a/package/flann/Config.in
+++ b/package/flann/Config.in
@@ -2,9 +2,6 @@ config BR2_PACKAGE_FLANN
 	bool "flann"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
-	# all gcc versions fail to build flann on Microblaze due to
-	# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69401
-	depends on !BR2_microblaze
 	help
 	  FLANN is a library for performing fast approximate nearest
 	  neighbor searches in high dimensional spaces. It contains a
@@ -25,5 +22,4 @@ config BR2_PACKAGE_FLANN_EXAMPLES
 endif
 
 comment "flann needs a toolchain w/ C++, dynamic library"
-	depends on !BR2_microblaze
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
diff --git a/package/flann/flann.mk b/package/flann/flann.mk
index d091ec18a0..6c2e6a9e78 100644
--- a/package/flann/flann.mk
+++ b/package/flann/flann.mk
@@ -18,4 +18,12 @@ FLANN_CONF_OPTS = \
 	-DPYTHON_EXECUTABLE=OFF \
 	-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE
 
+FLANN_CXXFLAGS = $(TARGET_CXXFLAGS)
+
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
+FLANN_CXXFLAGS += -O0
+endif
+
+FLANN_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(FLANN_CXXFLAGS)"
+
 $(eval $(cmake-package))