From 4b4bfec8a312132acc84b5166998d0cfa7c01931 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 18 May 2021 18:37:19 +0200
Subject: Improved entire building chain (especially debugging)

---
 Makefile | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 456659a..a6debed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,33 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-CFLAGS_OPTIMIZATION = -finline -finline-functions -Ofast
+CONFIG ?= dev
+include .build.mk
+
+define PREPROCESSOR_FLAG_TEMPLATE =
+-D$(1)=$(if $(filter $($(1)),true),1,0)
+endef
+
+PREPROCESSOR_FLAGS = $(foreach flag, $(ALL_PREPROCESSOR_FLAGS), $(call PREPROCESSOR_FLAG_TEMPLATE,$(flag)))
+
 CFLAGS_WARNINGS = -Wall -Wextra -Werror -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wformat=2 -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wcast-qual -Wswitch-default -Wswitch-enum -Wlogical-op -Wunreachable-code -Wundef -Wold-style-definition -Wvla -pedantic-errors
-CFLAGS_DEFAULT = $(CFLAGS_WARNINGS) $(CFLAGS_OPTIMIZATION) -std=c99 -m32 -nostdlib -nostdinc -fno-builtin -fno-profile-generate -fno-omit-frame-pointer -fno-common -fno-asynchronous-unwind-tables -mno-red-zone -mno-80387 -mno-mmx -mno-sse -mno-sse2
+CFLAGS_DEFAULT = $(CFLAGS_WARNINGS) -std=c99 -m32 -nostdlib -nostdinc -fno-builtin -fno-profile-generate -fno-omit-frame-pointer -fno-common -fno-asynchronous-unwind-tables -mno-red-zone -mno-80387 -mno-mmx -mno-sse -mno-sse2 $(CONFIG_OPTIMIZATION) $(CONFIG_EXTRA_CFLAGS) $(PREPROCESSOR_FLAGS)
 
-CC = ccache $(PWD)/cross/opt/bin/i686-elf-gcc
-LD = ccache $(PWD)/cross/opt/bin/i686-elf-ld
-OC = ccache $(PWD)/cross/opt/bin/i686-elf-objcopy
-ST = ccache $(PWD)/cross/opt/bin/i686-elf-strip
-AS = ccache nasm
+CC = $(CONFIG_CACHE) $(PWD)/cross/opt/bin/i686-elf-gcc
+LD = $(CONFIG_CACHE) $(PWD)/cross/opt/bin/i686-elf-ld
+OC = $(CONFIG_CACHE) $(PWD)/cross/opt/bin/i686-elf-objcopy
+ST = $(CONFIG_CACHE) $(PWD)/cross/opt/bin/i686-elf-strip
+AS = $(CONFIG_CACHE) nasm
 
 BUILD = $(PWD)/build/
 KERNEL = $(PWD)/kernel/
 LIBS = $(PWD)/libs/
 
-ifeq ($(DEBUG), 1)
-	CFLAGS_DEFAULT += -Wno-error -ggdb3 -s -fsanitize=undefined -fstack-protector-all
-endif
-
 all: compile
 
 export
 
 compile:
+	@echo Using '$(CONFIG)' config
 	@$(MAKE) clean --no-print-directory -C libs/libc/
 	@$(MAKE) libc --no-print-directory -C libs/libc/
 	@echo "Compiled libc"
-- 
cgit v1.2.3