summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-08-28 23:23:47 +0000
committerStefan Reinauer <stepan@openbios.org>2010-08-28 23:23:47 +0000
commitf7b98f57669ffe8453fa00067b322f82961d7b82 (patch)
treeed810656701993db57c379a395d3219d5eeca376
parentb3f8090f4e42a73434da3f6d7854762f855ee679 (diff)
downloadcoreboot-f7b98f57669ffe8453fa00067b322f82961d7b82.tar.xz
fix compilation of hello.elf example payload.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5746 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--payloads/libpayload/sample/Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
index 497f051999..1a32f3b0fb 100644
--- a/payloads/libpayload/sample/Makefile
+++ b/payloads/libpayload/sample/Makefile
@@ -28,10 +28,9 @@
##
# Sample libpayload Makefile.
-
-LIBPAYLOAD_DIR := ..
-CC := $(LIBPAYLOAD_DIR)/bin/lpgcc
-AS := $(LIBPAYLOAD_DIR)/bin/lpas
+LIBPAYLOAD_DIR := ../install/libpayload
+XCC := CC=$(CC) $(LIBPAYLOAD_DIR)/bin/lpgcc
+XAS := AS=$(AS) $(LIBPAYLOAD_DIR)/bin/lpas
CFLAGS := -Wall -Werror -Os
TARGET := hello
OBJS := $(TARGET).o
@@ -39,13 +38,13 @@ OBJS := $(TARGET).o
all: $(TARGET).elf
$(TARGET).elf: $(OBJS)
- $(CC) -o $@ $(OBJS)
+ $(XCC) -o $@ $(OBJS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(XCC) $(CFLAGS) -c -o $@ $<
%.S.o: %.S
- $(AS) --32 -o $@ $<
+ $(XAS) --32 -o $@ $<
clean:
rm -f $(TARGET).elf *.o