diff options
Diffstat (limited to 'i686')
| -rw-r--r-- | i686/Makefile | 2 | ||||
| -rw-r--r-- | i686/toolchain.mk | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/i686/Makefile b/i686/Makefile index 04257dc..431db77 100644 --- a/i686/Makefile +++ b/i686/Makefile @@ -1,4 +1,4 @@ -include ../${ARCH}/toolchain.mk +include ../Makefile.config CCFLAGS += -I../grub/include -I../lib diff --git a/i686/toolchain.mk b/i686/toolchain.mk index 7bef9bc..1c0d922 100644 --- a/i686/toolchain.mk +++ b/i686/toolchain.mk @@ -1,12 +1,16 @@ +ARCH=i686 + # define compiler, linker, archiver and strip and their flags # -AS = i686-elf-as -CC = i686-elf-gcc -CCFLAGS = -Wall -Wextra -Wpedantic -fanalyzer -ffreestanding -std=gnu11 -mgeneral-regs-only -LD = i686-elf-ld -LDFLAGS = -static -nostdlib -AR = i686-elf-ar -ARFLAGS = -crus -STRIP = i686-elf-strip +AS := i686-elf-as +CC := i686-elf-gcc +CCFLAGS := -Wall -Wextra -Wpedantic -fanalyzer -ffreestanding -std=gnu11 -mgeneral-regs-only +CCFLAGS += $(shell echo ${CONFIG_CCFLAGS}) +LD := i686-elf-ld +LDFLAGS := -static -nostdlib +LDFLAGS += $(shell echo ${CONFIG_LDFLAGS}) +AR := i686-elf-ar +ARFLAGS := -crus +STRIP := i686-elf-strip |