From a8d529e1b5112ff3278e4cc8c7c9b2f152fc5ff1 Mon Sep 17 00:00:00 2001 From: Vlad Poenaru Date: Wed, 15 Nov 2017 18:47:36 +0800 Subject: [PATCH] Diffentiate between Darwin and Linux --- arch/x86/toolchain.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/toolchain.mk b/arch/x86/toolchain.mk index 37e97fa..2d9a1b9 100644 --- a/arch/x86/toolchain.mk +++ b/arch/x86/toolchain.mk @@ -1,16 +1,23 @@ # Toolchain +UNAME:=$(shell uname) +ifeq ($(UNAME),Darwin) CC=i386-elf-gcc LD=i386-elf-ld AS=i386-elf-gcc AR=i386-elf-ar +# Assembler flags +ASFLAGS=-m32 -c -I. -I./include -fomit-frame-pointer --freestanding -nostdlib -fno-stack-protector +endif +ifeq ($(UNAME),Linux) +# Assembler flags +ASFLAGS=--32 -c -I. -I./include -fomit-frame-pointer -nostdlib -fno-stack-protector +endif # C flags CFLAGS=-c -ffreestanding -nostdlib -Wall -Werror -Wextra -fno-builtin -Wno-unused-parameter -Wno-unused-variable -m32 -O2 -fno-caller-saves CFLAGS+=$(foreach dir, $(INCDIR), -I$(dir)) -# Assembler flags -ASFLAGS=-m32 -c -I. -I./include -fomit-frame-pointer --freestanding -nostdlib -fno-stack-protector # Archiver flags ARFLAGS=rcs