fix dependency check logic cause config always disabled

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

diff --git a/lunaix-os/makeinc/toolchain.mkinc b/lunaix-os/makeinc/toolchain.mkinc
index 9496c5c15c1bd17d8f3fe36a210dad3ebadb19fc..fcc6f423e82bac32796630a6d9b2b4282b2652ab 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -1,37 +1,15 @@
-CC := i686-elf-gcc
-AS := i686-elf-as
-AR := i686-elf-ar
-
-
-ARCH_OPT := -D__ARCH_IA32
-O := -O2
-W := -Wall -Wextra -Wno-unknown-pragmas \
-               -Wno-unused-function \
-               -Wno-unused-variable\
-               -Wno-unused-but-set-variable \
-               -Wno-unused-parameter \
-               -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 $(OFLAGS) $(W) $(ARCH_OPT)
-
-ifeq ($(BUILD_MODE),debug)
-       O = -Og
-       CFLAGS += -g
+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)
+
+ifeq ($(MODE),debug)
+       O := -Og
+else
+       O := -O2
 endif
 
-CFLAGS += $(O)
-
-LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
-
+LDFLAGS := $(O)
+CFLAGS  := -std=gnu99 -g $(O)
 MKFLAGS := --no-print-directory
\ No newline at end of file