merge r13739 to 8.09

[openwrt/svn-archive/openwrt.git] / package / uci / Makefile

diff --git a/package/uci/Makefile b/package/uci/Makefile
index 4d787ddfd2d40a88ed4767e4e0210ec0b005c201..69dd50baeae8e61f5185864287c493f79c61e349 100644 (file)
--- a/package/uci/Makefile
+++ b/package/uci/Makefile
@@ -56,6 +56,11 @@ UCI_MAKEOPTS = \
                CPPFLAGS="-I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include" \
                OS="Linux"
 
+# work around a nasty gcc bug
+ifneq ($(CONFIG_GCC_VERSION_4_2_4),)
+  UCI_MAKEOPTS += WOPTS=""
+endif
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) $(UCI_MAKEOPTS)
        $(MAKE) -C $(PKG_BUILD_DIR)/lua $(UCI_MAKEOPTS)