From: Ben Pfaff Date: Mon, 13 Sep 2004 22:56:14 +0000 (+0000) Subject: Use i386-elf-* tools by default. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287d94b7afcfb6dd65fc6fde02e9a4dc6e099a16;p=pintos-anon Use i386-elf-* tools by default. --- diff --git a/src/Makefile.build b/src/Makefile.build index 017267f..43273a7 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -4,7 +4,15 @@ include ../Makefile.vars SHELL = /bin/sh -CC = gcc +# Utilities. +# On a system where i386-elf is native (e.g. on an x86 GNU/Linux +# machine) you want to set BINUTIL_PREFIX to expand to null, as shown +# in the line that's commented out. +BINUTIL_PREFIX = i386-elf- +#BINUTIL_PREFIX = +CC = $(BINUTIL_PREFIX)gcc +LD = $(BINUTIL_PREFIX)ld +OBJCOPY = $(BINUTIL_PREFIX)objcopy VPATH = ../.. @@ -75,10 +83,10 @@ threads/kernel.lds.s: CPPFLAGS += -P -C threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h kernel.o: threads/kernel.lds.s $(OBJECTS) - ld -T $< -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name` + $(LD) -T $< -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name` kernel.bin: kernel.o - objcopy -O binary -R .note -R .comment -S $< $@.tmp + $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp ../../pad 4096 < $@.tmp > $@ rm $@.tmp @@ -86,7 +94,7 @@ threads/loader.o: threads/loader.S kernel.bin $(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'` loader.bin: threads/loader.o - ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ $< + $(LD) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $< os.dsk: loader.bin kernel.bin cat $^ > $@