summaryrefslogtreecommitdiffstats
path: root/rules/grub.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2004-01-27 18:34:53 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2004-01-27 18:34:53 +0000
commitc3a3a2eaa9d2dd7687c4540835579fc02be70ee6 (patch)
tree039bdaeb2464db7e4106d318e9b3de2dad64ad26 /rules/grub.make
parenta243e1195f474ddde59a8f7fdbeb702c0d7d359d (diff)
downloadptxdist-c3a3a2eaa9d2dd7687c4540835579fc02be70ee6.tar.gz
ptxdist-c3a3a2eaa9d2dd7687c4540835579fc02be70ee6.tar.xz
Added patch mechanism for reiserfs tweak; fixed inline problem.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@998 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/grub.make')
-rw-r--r--rules/grub.make11
1 files changed, 9 insertions, 2 deletions
diff --git a/rules/grub.make b/rules/grub.make
index 338f307a1..f5ecd545c 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Id: grub.make,v 1.9 2004/01/27 14:52:14 bsp Exp $
+# $Id: grub.make,v 1.10 2004/01/27 18:34:53 robert Exp $
#
# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
@@ -31,6 +31,7 @@ grub_get: $(STATEDIR)/grub.get
$(STATEDIR)/grub.get: $(GRUB_SOURCE)
@$(call targetinfo, $@)
+ @$(call get_patches, $(GRUB))
touch $@
$(GRUB_SOURCE):
@@ -47,6 +48,7 @@ $(STATEDIR)/grub.extract: $(STATEDIR)/grub.get
@$(call targetinfo, $@)
@$(call clean, $(GRUB_DIR))
@$(call extract, $(GRUB_SOURCE))
+ @$(call patchin, $(GRUB))
touch $@
# ----------------------------------------------------------------------------
@@ -56,7 +58,12 @@ $(STATEDIR)/grub.extract: $(STATEDIR)/grub.get
grub_prepare: $(STATEDIR)/grub.prepare
GRUB_PATH = PATH=$(CROSS_PATH)
-GRUB_ENV = $(CROSS_ENV)
+
+# RSC: grub 0.93 decides to build without optimization when it detects
+# non-standard CFLAGS. We can unset them here as grub is compiled
+# standalone anyway (without Linux/glibc includes)
+
+GRUB_ENV = $(CROSS_ENV) CFLAGS=''
GRUB_AUTOCONF = --build=$(GNU_HOST)
GRUB_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)