fix x86 image builder

[openwrt.git] / target / linux / x86-2.6 / image / grub / Makefile

diff --git a/target/linux/x86-2.6/image/grub/Makefile b/target/linux/x86-2.6/image/grub/Makefile
index e30443e..365b327 100644 (file)
--- a/target/linux/x86-2.6/image/grub/Makefile
+++ b/target/linux/x86-2.6/image/grub/Makefile
@@ -43,6 +43,7 @@ ifeq ($(HOST_ARCH),x86_64)
                --mandir=/usr/man \
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                --mandir=/usr/man \
                --infodir=/usr/info \
                $(DISABLE_NLS) \

+               --disable-auto-linux-mem-opt \

        )
   endef
 else
        )
   endef
 else


@@ -62,12 +63,20 @@ else
                --localstatedir=/var \
                --mandir=/usr/man \
                --infodir=/usr/info \
                --localstatedir=/var \
                --mandir=/usr/man \
                --infodir=/usr/info \

+               $(DISABLE_NLS) \
+               --disable-auto-linux-mem-opt \

        )
   endef
 endif
 
        )
   endef
 endif
 

+#
+# ./configure detects whether the host compiler supports 
+# -fno-stack-protector but only sets STAGE2_CFLAGS accordingly
+#

 define Build/Compile
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               GRUB_CFLAGS="\$$$$(STAGE2_CFLAGS)" \
+               STAGE1_CFLAGS="\$$$$(STAGE2_CFLAGS)"

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev