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 7421f45736d48386766e1aee0c1bc8c303bf8ae2..a53848831733e7708a7c01e5fbb354d51506f3f4 100644 (file)
--- a/lunaix-os/makeinc/toolchain.mkinc
+++ b/lunaix-os/makeinc/toolchain.mkinc
@@ -2,12 +2,8 @@ CC := $(CX_PREFIX)gcc
 CC := $(CX_PREFIX)gcc
 AS := $(CX_PREFIX)as
 AR := $(CX_PREFIX)ar
 CC := $(CX_PREFIX)gcc
 AS := $(CX_PREFIX)as
 AR := $(CX_PREFIX)ar

-PY := python3
+LBUILD ?= $(shell realpath ./scripts/build-tools/luna_build.py)

 
 

-STRIP_OSDEP_CC := -ffreestanding -fno-pie
-STRIP_OSDEP_LD := -nostdlib -nolibc -z noexecstack -no-pie -Wl,--build-id=none
-
-ARCH_OPT := -m32 -D__ARCH_IA32

 O := -O2
 W := -Wall -Wextra -Werror \
                -Wno-unknown-pragmas \
 O := -O2
 W := -Wall -Wextra -Werror \
                -Wno-unknown-pragmas \


@@ -28,15 +24,15 @@ OFLAGS := -fno-gcse\
                  -fno-indirect-inlining\
                  -fno-omit-frame-pointer
 
                  -fno-indirect-inlining\
                  -fno-omit-frame-pointer
 

-CFLAGS := $(ARCH_OPT) -std=gnu99 $(OFLAGS) $(W)
+CFLAGS := -std=gnu99 $(OFLAGS) $(W)

 
 

-ifeq ($(BUILD_MODE),debug)
+ifeq ($(MODE),debug)

        O = -Og
        CFLAGS += -g
 endif
 
        O = -Og
        CFLAGS += -g
 endif
 

-CFLAGS += $(O) $(STRIP_OSDEP_CC)
+CFLAGS += $(O)

 
 

-LDFLAGS := $(ARCH_OPT) $(O) $(STRIP_OSDEP_LD)
+LDFLAGS := $(O)

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