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

diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile
index 497f051999d356d5e9d2fa3921c69c38059d1f3b..1a32f3b0fb5a1bf19173ea6941decc01944d8575 100644 (file)
--- 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