From ccc1dd7b4ba8ad5efe51aac32b26f0859d93fbe5 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Mon, 5 Apr 2021 19:37:28 +0200
Subject: Restructured make layout and cleaned some apps

---
 Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 30dd819..5d8d616 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,21 @@
 
 CFLAGS_OPTIMIZATION = -finline -finline-functions -Ofast
 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 # Everything after -fno-builtin is optional
+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
+
+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
+
+BUILD = $(PWD)/build/
+KERNEL = $(PWD)/kernel/
+LIBS = $(PWD)/libs/
 
 all: compile
 
-# TODO: Fix stack protector in userspace
-# TODO: Fix ubsan in userspace - Os should be a temporary fix
-debug: CFLAGS_DEFAULT += -Wno-error -ggdb3 -s -Os -fsanitize=undefined -fstack-protector-all
+debug: CFLAGS_DEFAULT += -Wno-error -ggdb3 -s -fsanitize=undefined -fstack-protector-all
 debug: compile
 
 export
-- 
cgit v1.2.3