git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rewrite the device subsystem interfaces (#48)
[lunaix-os.git]
/
lunaix-os
/
makeinc
/
toolchain.mkinc
diff --git
a/lunaix-os/makeinc/toolchain.mkinc
b/lunaix-os/makeinc/toolchain.mkinc
index fffd1828a15789c9439f2aabd38496cda893b4df..246b9d15196ff53d78a318494311f206a1b07d2c 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,24
+14,19
@@
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-small-functions \
- -fno-indirect-inlining
+OFLAGS := -fno-omit-frame-pointer \
+ -finline-small-functions
-CFLAGS := -std=gnu99
-ffreestanding $(OFLAGS) $(W) $(ARCH_OPT)
+CFLAGS := -std=gnu99
$(OFLAGS) $(W) -g
-ifeq ($(BUILD_MODE),debug)
- O = -Og
- CFLAGS += -g
+ifeq ($(MODE),debug)
+ O := -Og
+else
+ O := -O2
endif
CFLAGS += $(O)
endif
CFLAGS += $(O)
-LDFLAGS :=
-ffreestanding $(O) -nostdlib -lgcc
+LDFLAGS :=
$(O)
MKFLAGS := --no-print-directory
\ No newline at end of file
MKFLAGS := --no-print-directory
\ No newline at end of file