diff --git a/fsdrv/Makefile b/fsdrv/Makefile index 76b36e1..51a610b 100644 --- a/fsdrv/Makefile +++ b/fsdrv/Makefile @@ -1,7 +1,7 @@ C_SOURCES = $(wildcard *.c) OBJ = $(C_SOURCES:.c=.o ) CFLAGS = -Wall -g --sysroot=../sysroot -isystem=/usr/include -nostdlib -CC = i386-elf-gcc +CC = i386-myos-gcc fsdrv: $(OBJ) ../libc/* @$(CC) -z max-page-size=4096 -Xlinker -n -o $@ $(CFLAGS) $(OBJ) ../kernel/start.o ../sysroot/usr/lib/libc.a -lgcc diff --git a/init/Makefile b/init/Makefile index ae51226..eb34d45 100644 --- a/init/Makefile +++ b/init/Makefile @@ -1,10 +1,10 @@ C_SOURCES = $(wildcard *.c) OBJ = $(C_SOURCES:.c=.o ) -CFLAGS = -Wall -g --sysroot=../sysroot -isystem=/usr/include -nostdlib -CC = i386-elf-gcc +CFLAGS = -Wall -g +CC = i386-myos-gcc init: $(OBJ) ../libc/* - @$(CC) -z max-page-size=4096 -Xlinker -n -o $@ $(CFLAGS) $(OBJ) ../kernel/start.o ../sysroot/usr/lib/libc.a -lgcc + @$(CC) -o $@ $(CFLAGS) $(OBJ) %.o: %.c @$(CC) $(CFLAGS) -c $< -o $@ diff --git a/psinfo/i386/ar.txt b/psinfo/i386/ar.txt index 6d7bc03..e1fe7ab 100644 --- a/psinfo/i386/ar.txt +++ b/psinfo/i386/ar.txt @@ -1 +1 @@ -i386-elf-ar +i386-myos-ar diff --git a/psinfo/i386/as.txt b/psinfo/i386/as.txt index f679475..2de15bc 100644 --- a/psinfo/i386/as.txt +++ b/psinfo/i386/as.txt @@ -1 +1 @@ -i386-elf-as +i386-myos-as diff --git a/psinfo/i386/cc.txt b/psinfo/i386/cc.txt index 9839a5c..3149f38 100644 --- a/psinfo/i386/cc.txt +++ b/psinfo/i386/cc.txt @@ -1 +1 @@ -i386-elf-gcc +i386-myos-gcc diff --git a/vfs/Makefile b/vfs/Makefile index 5289efd..b262fdd 100644 --- a/vfs/Makefile +++ b/vfs/Makefile @@ -1,7 +1,7 @@ C_SOURCES = $(wildcard *.c) OBJ = $(C_SOURCES:.c=.o) CFLAGS = -Wall -g --sysroot=../sysroot -isystem=/usr/include -nostdlib -CC = i386-elf-gcc +CC = i386-myos-gcc vfs: $(OBJ) ../libc/* @$(CC) -z max-page-size=4096 -Xlinker -n -o $@ $(CFLAGS) $(OBJ) ../kernel/start.o ../sysroot/usr/lib/libc.a -lgcc