aboutsummaryrefslogtreecommitdiff
path: root/Makefile.config
diff options
context:
space:
mode:
authoraqua <aqua@iserlohn-fortress.net>2022-12-10 20:56:57 +0200
committeraqua <aqua@iserlohn-fortress.net>2022-12-11 11:32:51 +0200
commit9b2a78fa52249ab481493550490aa5f37872dcf6 (patch)
tree127031268b9b42b0fbdae3d87684d9c045983677 /Makefile.config
parentRename CCFLAGS to CFLAGS (diff)
downloadkernel-9b2a78fa52249ab481493550490aa5f37872dcf6.tar.xz
Rewrite drivers/uart and drivers/vga in cpp
Diffstat (limited to 'Makefile.config')
-rw-r--r--Makefile.config32
1 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.config b/Makefile.config
index 1ea871c..42aa510 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -3,6 +3,7 @@
# Toolchain
#
CONFIG_CFLAGS="-g -Og"
+CONFIG_CXXFLAGS="-g -Og"
CONFIG_LDFLAGS=""
# end of Toolchain
@@ -25,19 +26,20 @@ CONFIG_KB_PS2=y
ARCH=i686
# define compiler, linker, archiver and strip and their flags
-#
-AS := i686-elf-as
-CC := i686-elf-gcc
-CFLAGS := -Wall -Wextra -Wpedantic -Wshadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 -mgeneral-regs-only
-CFLAGS += $(shell echo ${CONFIG_CFLAGS})
-LD := i686-elf-ld
-LDFLAGS := -static -nostdlib
-LDFLAGS += $(shell echo ${CONFIG_LDFLAGS})
-AR := i686-elf-ar
-ARFLAGS := -crus
-STRIP := i686-elf-strip
-
-# test framework
-GTEST := $(shell pkg-config --cflags --libs gtest gtest_main)
-GMOCK := $(shell pkg-config --cflags --libs gmock)
+# FIXME: cpp threadsafe statics
+AS := i686-elf-as
+CC := i686-elf-gcc
+CXX := i686-elf-g++
+CFLAGS := -Wall -Wextra -Wpedantic -Wshadow -Wconversion -fanalyzer -ffreestanding -std=gnu11 \
+ -mgeneral-regs-only
+CFLAGS += $(shell echo ${CONFIG_CFLAGS})
+CXXFLAGS := -Wall -Wextra -Wpedantic -Wshadow -Wconversion -ffreestanding -std=c++17 \
+ -mgeneral-regs-only -fno-use-cxa-atexit -fno-threadsafe-statics -fno-exceptions -fno-rtti
+CXXFLAGS += $(shell echo ${CONFIG_CXXFLAGS})
+LD := i686-elf-ld
+LDFLAGS := -static -nostdlib
+LDFLAGS += $(shell echo ${CONFIG_LDFLAGS})
+AR := i686-elf-ar
+ARFLAGS := -crus
+STRIP := i686-elf-strip