From c6b7f7722169f06f8bd67be6649d8eb527f66a13 Mon Sep 17 00:00:00 2001 From: acevest Date: Fri, 29 Oct 2021 08:00:13 +0800 Subject: [PATCH] fix compile under MacOS --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8814119..75dbf4a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,10 @@ CC = gcc +LD = ld +UNAME := $(shell uname -s) +ifeq ($(UNAME), Darwin) + CC = i686-elf-gcc + LD = i686-elf-ld +endif CFLAGS = -g -c -fno-builtin -m32 SYSTEMMAP = System.map KERNELBIN = KERNEL.BIN @@ -15,7 +21,7 @@ HEADER_FILES := $(foreach DIR, $(INC_DIRS), $(wildcard $(DIR)/*.h)) OBJS := $(patsubst %,%.o,$(SOURCE_FILES)) ${KERNELBIN}: ${OBJS} - ld -m elf_i386 -M -T$(LINKSCRIPT) $(OBJS) -o $@ > $(SYSTEMMAP) + ${LD} -m elf_i386 -M -T$(LINKSCRIPT) $(OBJS) -o $@ > $(SYSTEMMAP) rm kernel/setup.c.o %.S.o: %.S ${HEADER_FILES} -- 2.44.0