aboutsummaryrefslogtreecommitdiff
path: root/i686/toolchain.mk
diff options
context:
space:
mode:
Diffstat (limited to 'i686/toolchain.mk')
-rw-r--r--i686/toolchain.mk31
1 files changed, 16 insertions, 15 deletions
diff --git a/i686/toolchain.mk b/i686/toolchain.mk
index 43c758c..ae2fb35 100644
--- a/i686/toolchain.mk
+++ b/i686/toolchain.mk
@@ -1,19 +1,20 @@
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