Merge branch 'master' into isa/arm64

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

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index 42fae9fa3dfc36c517946950fd5b0cb259dcb9b4..96dd3c4e1fcd308411a7437bdd5d911b8a320fb9 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 := $(CX_PREFIX)gcc
+CC := $(CX_PREFIX)gcc
+AS := $(CX_PREFIX)as
+AR := $(CX_PREFIX)ar
+LBUILD ?= $(shell realpath ./scripts/build-tools/luna_build.py)

 
 
 
 

-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 \


@@ -13,17 +14,18 @@ W := -Wall -Wextra -Wno-unknown-pragmas \
                -Wno-discarded-qualifiers\
                -Werror=incompatible-pointer-types
 
                -Wno-discarded-qualifiers\
                -Werror=incompatible-pointer-types
 

-OFLAGS := -fno-gcse\
-                 -fno-gcse-lm\
-                 -fno-cse-follow-jumps\
-                 -fno-cse-skip-blocks\
-                 -fno-optimize-strlen\
-                 -fno-inline-functions-called-once \
-                 -fno-inline-functions \
-                 -fno-inline-small-functions \
-                 -fno-indirect-inlining
-
-CFLAGS := -std=gnu99 -ffreestanding $(O) $(OFLAGS) $(W) $(ARCH_OPT)
-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+OFLAGS := -fno-omit-frame-pointer
+
+CFLAGS := -std=gnu99 $(OFLAGS) $(W) -g
+
+ifeq ($(MODE),debug)
+       O := -Og
+else
+       O := -O2
+endif
+
+CFLAGS += $(O)
+
+LDFLAGS := $(O)

 
 MKFLAGS := --no-print-directory
\ No newline at end of file
 
 MKFLAGS := --no-print-directory
\ No newline at end of file