Add cross-compile support (for fools like me who build on OS X) to the Makefiles.

diff --git a/grubload/Makefile b/grubload/Makefile
index 3c7e395f7115f1c311c2cff84bf1e3622c862d24..49e0e4e01d961f276a89682842dfbebe5b2de12f 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,17 +1,19 @@
+-include ../config.mk
+

 OBJS=multiboot_c.o multiboot_asm.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o output.o ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o
 OBJS=multiboot_c.o multiboot_asm.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o output.o ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o

-CC=gcc
+CC=$(CROSS)gcc

 CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99
 
 all: multiboot
 
 multiboot: $(OBJS)
 CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc -Wall -Werror -pedantic -std=gnu99
 
 all: multiboot
 
 multiboot: $(OBJS)

-       ld -o multiboot $(OBJS) -Ttext=0x100000
+       $(CROSS)ld -o multiboot $(OBJS) -Ttext=0x100000

 
 realmode.bin: realmode.asm
        nasm -o realmode.bin realmode.asm
 
 realmode.o: realmode.bin
 
 realmode.bin: realmode.asm
        nasm -o realmode.bin realmode.asm
 
 realmode.o: realmode.bin

-       objcopy -I binary -B i386 -O elf32-i386 realmode.bin realmode.o
+       $(CROSS)objcopy -I binary -B i386 -O elf32-i386 realmode.bin realmode.o

 
 clean:
        rm -f $(OBJS) realmode.bin multiboot
 
 clean:
        rm -f $(OBJS) realmode.bin multiboot

diff --git a/netwatch/Makefile b/netwatch/Makefile
index 9609e0382c7047be4706420e602390d8d5007e53..eb3da87b296b5897a32026c1832377fa2babe008 100644 (file)
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -1,4 +1,6 @@
-CC=gcc-4.3
+-include ../config.mk
+
+CC=$(CROSS)gcc

 CFLAGS=-I../include -I../include/raw \
        -I../lwip/src/include -I../lwip/src/include/ipv4 \
        -nostdlib -nostdinc -fno-builtin -D__RAW__ \
 CFLAGS=-I../include -I../include/raw \
        -I../lwip/src/include -I../lwip/src/include/ipv4 \
        -nostdlib -nostdinc -fno-builtin -D__RAW__ \


@@ -72,12 +74,12 @@ OBJS =      ../ich2/smi.o \
 all: aseg.elf
 
 aseg.elf: netwatch-large.lds $(STUBOBJS) $(OBJS)
 all: aseg.elf
 
 aseg.elf: netwatch-large.lds $(STUBOBJS) $(OBJS)

-       ld -o aseg.elf -T netwatch-large.lds $(STUBOBJS) $(OBJS)
+       $(CROSS)ld -o aseg.elf -T netwatch-large.lds $(STUBOBJS) $(OBJS)

 
 clean:
        rm -f $(OBJS) aseg.elf entry.bin entry.o
 
 %.o: %.asm
        nasm -o $@.bin $<
 
 clean:
        rm -f $(OBJS) aseg.elf entry.bin entry.o
 
 %.o: %.asm
        nasm -o $@.bin $<

-       objcopy -I binary -B i386 -O elf32-i386 $@.bin $@
+       $(CROSS)objcopy -I binary -B i386 -O elf32-i386 $@.bin $@

        rm -f $@.bin
        rm -f $@.bin