summaryrefslogtreecommitdiff
path: root/Kernel/Makefile
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-02-22 10:45:32 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-02-22 10:45:32 +0100
commit75b100673fb721eda824372ddee0d7417410c00e (patch)
treeb1ba99e8b18463e2de14a455af4f8c6980486080 /Kernel/Makefile
parentafa6f88039b7466151d56650c528dc95009c14aa (diff)
downloadserenity-75b100673fb721eda824372ddee0d7417410c00e.zip
Switch over to building everything with i686-elf-g++.
Diffstat (limited to 'Kernel/Makefile')
-rw-r--r--Kernel/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile
index 6b04393e21..62df5aaa9e 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -66,9 +66,9 @@ BOOTLOADER = Boot/boot.bin
IMAGE = .floppy-image
ARCH_FLAGS =
STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc
-KERNEL_FLAGS = -ffreestanding -fno-stack-protector -fno-builtin
+KERNEL_FLAGS =
WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -mregparm=3 -march=i686 -m32 -fno-exceptions -fno-rtti
+FLAVOR_FLAGS = -mregparm=3 -fno-exceptions -fno-rtti
OPTIMIZATION_FLAGS = -Os
INCLUDE_FLAGS = -I.. -I.
#SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn
@@ -76,9 +76,9 @@ INCLUDE_FLAGS = -I.. -I.
DEFINES = -DSERENITY -DKERNEL -DSANITIZE_PTRS
CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(KERNEL_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = clang
-LD = ld
-LDFLAGS = -T linker.ld --strip-debug -melf_i386 --gc-sections
+CXX = ~/opt/cross/bin/i686-elf-g++
+LD = ~/opt/cross/bin/i686-elf-ld
+LDFLAGS = -T linker.ld
all: $(KERNEL) $(IMAGE) kernel.map