aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Boyett <agb@openwrt.org>2008-06-20 01:43:20 +0000
committerAndy Boyett <agb@openwrt.org>2008-06-20 01:43:20 +0000
commit652fa86fe78132e747aa1e7d336489dfe38c7775 (patch)
treece290ddd39514b2d24814c4cd7a960d4b15592ad
parentcbea377252c08cce9524d4c193033d7a3f8a5dee (diff)
downloadupstream-652fa86fe78132e747aa1e7d336489dfe38c7775.tar.gz
upstream-652fa86fe78132e747aa1e7d336489dfe38c7775.tar.bz2
upstream-652fa86fe78132e747aa1e7d336489dfe38c7775.zip
grub: Natively build grub only on x86 linux hosts, cross compile everywhere else. - Closes #3560
SVN-Revision: 11542
-rw-r--r--package/grub/Makefile14
1 files changed, 10 insertions, 4 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 98bb68b564..7dfd1429d2 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -1,5 +1,5 @@
-#
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -30,7 +30,13 @@ define Package/grub
URL:=http://www.gnu.org/software/grub/
endef
-ifeq ($(HOST_ARCH),x86_64)
+ifeq ($(HOST_OS),Linux)
+ NATIVEGRUB-i386:=1
+ NATIVEGRUB-i686:=1
+ NATIVEGRUB:=$(NATIVEGRUB-$(HOST_ARCH))
+endif
+
+ifeq ($(NATIVEGRUB),)
CONFIGURE_FLAGS:= \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -62,7 +68,7 @@ define Build/Configure
endef
#
-# ./configure detects whether the host compiler supports
+# ./configure detects whether the host compiler supports
# -fno-stack-protector but only sets STAGE2_CFLAGS accordingly
#
define Build/Compile