X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fgrub%2FMakefile;h=7e6f3527ecac5210e89bc9e3470a44e47f619d65;hb=39b8ede1e7d866cd1d82ef1babc53d2eacdb5a26;hp=98bb68b564714be2ab1eeeed9f39be608a1512d5;hpb=080c74e2121e4edb7e939a6141932f5c8e5958a3;p=openwrt-10.03%2F.git

diff --git a/package/grub/Makefile b/package/grub/Makefile
index 98bb68b56..7e6f3527e 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.
@@ -22,6 +22,8 @@ PKG_TARGETS:=bin
 
 include $(INCLUDE_DIR)/package.mk
 
+export grub_cv_prog_objcopy_absolute=yes
+
 define Package/grub
   SECTION:=boot
   DEPENDS:=@TARGET_x86
@@ -30,7 +32,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) \
@@ -39,6 +47,7 @@ else
 CONFIGURE_FLAGS:=
 endif
 
+ifneq ($(HOST_OS),Darwin)
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		LDFLAGS="-static" \
@@ -62,7 +71,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
@@ -77,5 +86,6 @@ define Build/InstallDev
 		install
 	mv $(STAGING_DIR_HOST)/usr/sbin/grub $(STAGING_DIR_HOST)/bin
 endef
+endif
 
 $(eval $(call BuildPackage,grub))