summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-01-02 19:36:39 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-01-02 19:36:39 +0000
commit76a8dfe8fcd964cdb018e17d49603143efd6720d (patch)
treed4dcef1adb0f87d0f9ac566379450f913bfcea38
parenta87d2cc152cebb37b7aed811168e8d21b98c1ff1 (diff)
fix grub segfaults on hosts where gcc is built with stack smashing protection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5969 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86-2.6/image/grub/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/x86-2.6/image/grub/Makefile b/target/linux/x86-2.6/image/grub/Makefile
index e30443e18c..365b327622 100644
--- 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) \
+ --disable-auto-linux-mem-opt \
)
endef
else
@@ -62,12 +63,20 @@ else
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
+ $(DISABLE_NLS) \
+ --disable-auto-linux-mem-opt \
)
endef
endif
+#
+# ./configure detects whether the host compiler supports
+# -fno-stack-protector but only sets STAGE2_CFLAGS accordingly
+#
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