Architectural Support: x86_64 (#37)

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

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index 70ef37bf9c989ad716a2719e2cb722f7fa127ea8..a53848831733e7708a7c01e5fbb354d51506f3f4 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -1,12 +1,12 @@
-CC := i686-elf-gcc
-AS := i686-elf-as
-AR := i686-elf-ar
-PY := python
+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 -Werror -Wno-unknown-pragmas \
+W := -Wall -Wextra -Werror \
+               -Wno-unknown-pragmas \
                -Wno-unused-function \
                -Wno-unused-variable\
                -Wno-unused-but-set-variable \
@@ -21,17 +21,18 @@ OFLAGS := -fno-gcse\
                  -fno-optimize-strlen\
                  -fno-inline-functions-called-once \
                  -fno-inline-small-functions \
-                 -fno-indirect-inlining
+                 -fno-indirect-inlining\
+                 -fno-omit-frame-pointer
 
-CFLAGS := -std=gnu99 -ffreestanding -MMD $(OFLAGS) $(W) $(ARCH_OPT)
+CFLAGS := -std=gnu99 $(OFLAGS) $(W)
 
-ifeq ($(BUILD_MODE),debug)
+ifeq ($(MODE),debug)
        O = -Og
        CFLAGS += -g
 endif
 
 CFLAGS += $(O)
 
-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
+LDFLAGS := $(O)
 
 MKFLAGS := --no-print-directory
\ No newline at end of file