refactor: one more step towards arch-agnostic design

[lunaix-os.git] / lunaix-os / makeinc / toolchain.mkinc

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index 42fae9fa3dfc36c517946950fd5b0cb259dcb9b4..b629d6fc974d07078a4c0732f217487b620c21f5 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -1,11 +1,12 @@
 CC := i686-elf-gcc
 AS := i686-elf-as
 AR := i686-elf-ar
 CC := i686-elf-gcc
 AS := i686-elf-as
 AR := i686-elf-ar

+PY := python

 
 
 ARCH_OPT := -D__ARCH_IA32
 O := -O2
 
 
 ARCH_OPT := -D__ARCH_IA32
 O := -O2

-W := -Wall -Wextra -Wno-unknown-pragmas \
+W := -Wall -Wextra -Werror -Wno-unknown-pragmas \

                -Wno-unused-function \
                -Wno-unused-variable\
                -Wno-unused-but-set-variable \
                -Wno-unused-function \
                -Wno-unused-variable\
                -Wno-unused-but-set-variable \


@@ -19,11 +20,18 @@ OFLAGS := -fno-gcse\
                  -fno-cse-skip-blocks\
                  -fno-optimize-strlen\
                  -fno-inline-functions-called-once \
                  -fno-cse-skip-blocks\
                  -fno-optimize-strlen\
                  -fno-inline-functions-called-once \

-                 -fno-inline-functions \

                  -fno-inline-small-functions \
                  -fno-indirect-inlining
 
                  -fno-inline-small-functions \
                  -fno-indirect-inlining
 

-CFLAGS := -std=gnu99 -ffreestanding $(O) $(OFLAGS) $(W) $(ARCH_OPT)
+CFLAGS := -std=gnu99 -ffreestanding $(OFLAGS) $(W) $(ARCH_OPT)
+
+ifeq ($(BUILD_MODE),debug)
+       O = -Og
+       CFLAGS += -g
+endif
+
+CFLAGS += $(O)
+

 LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
 
 MKFLAGS := --no-print-directory
\ No newline at end of file
 LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
 
 MKFLAGS := --no-print-directory
\ No newline at end of file