summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-04-05 02:56:23 +0200
committerAndreas Kling <awesomekling@gmail.com>2019-04-05 02:56:23 +0200
commit6df5e3f51aa053c54dfd7cbaf81ac09e4fc48d61 (patch)
tree97af8a220a5fa509135528810b5535bf62c3260a
parentec7817af37db02490b033599f56200812c52c9dc (diff)
downloadserenity-6df5e3f51aa053c54dfd7cbaf81ac09e4fc48d61.zip
Kernel: Build with i686-pc-serenity-g++.
This works just fine, and now we only need one cross-compiler. :^)
-rw-r--r--Kernel/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/Makefile b/Kernel/Makefile
index aaab46fa2e..847674111a 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -76,7 +76,7 @@ OBJS = $(CXX_OBJS) Boot/boot.ao
KERNEL = kernel
ARCH_FLAGS =
STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc
-KERNEL_FLAGS =
+KERNEL_FLAGS = -ffreestanding
WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
FLAVOR_FLAGS = -mregparm=3 -fno-exceptions -fno-rtti
OPTIMIZATION_FLAGS = -Os
@@ -88,9 +88,9 @@ 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 $(CLANG_FLAGS)
-CXX = i686-elf-g++
-LD = i686-elf-ld
-AS = i686-elf-as
+CXX = i686-pc-serenity-g++
+LD = i686-pc-serenity-ld
+AS = i686-pc-serenity-as
LDFLAGS = -T linker.ld
all: $(KERNEL) kernel.map