[commit] r5746 - trunk/payloads/libpayload/sample

[repository service]

Author: stepan
Date: Sun Aug 29 01:23:47 2010
New Revision: 5746
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5746

Log:
fix compilation of hello.elf example payload.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/payloads/libpayload/sample/Makefile

Modified: trunk/payloads/libpayload/sample/Makefile
==============================================================================
--- trunk/payloads/libpayload/sample/Makefile	Fri Aug 27 11:36:41 2010	(r5745)
+++ trunk/payloads/libpayload/sample/Makefile	Sun Aug 29 01:23:47 2010	(r5746)
@@ -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 @@
 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