diff --git a/GNUmakefile.in b/GNUmakefile.in index 351f86e6..9b5c31b4 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -25,7 +25,7 @@ MKESCAPE = $(subst $(SPACE),\ ,$(1)) SHESCAPE = $(subst ','\'',$(1)) NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1)) -define DEFAULT_VAR = +define PROPER_ASSIGN = ifeq ($(origin $1),default) override $(1) := $(2) endif @@ -43,7 +43,7 @@ override BUILD_PXE := @BUILD_PXE@ override BUILD_CD := @BUILD_CD@ override BUILD_LIMINE_DEPLOY := @BUILD_LIMINE_DEPLOY@ -$(eval $(call DEFAULT_VAR,CC,@CC@)) +$(eval $(call PROPER_ASSIGN,CC,@CC@)) export CC override MKDIR_P := @MKDIR_P@ diff --git a/common/GNUmakefile b/common/GNUmakefile index 3a96e11e..cc996dff 100644 --- a/common/GNUmakefile +++ b/common/GNUmakefile @@ -1,6 +1,11 @@ override MAKEFLAGS += -rR include $(TOOLCHAIN_FILE) +export CC_FOR_TARGET +export LD_FOR_TARGET +export OBJDUMP_FOR_TARGET +export OBJCOPY_FOR_TARGET +export READELF_FOR_TARGET TARGET ?= BUILDDIR ?= diff --git a/decompressor/GNUmakefile b/decompressor/GNUmakefile index 3b8ba1b3..96709fd4 100644 --- a/decompressor/GNUmakefile +++ b/decompressor/GNUmakefile @@ -1,6 +1,11 @@ override MAKEFLAGS += -rR include $(TOOLCHAIN_FILE) +export CC_FOR_TARGET +export LD_FOR_TARGET +export OBJDUMP_FOR_TARGET +export OBJCOPY_FOR_TARGET +export READELF_FOR_TARGET BUILDDIR ?= diff --git a/test/GNUmakefile b/test/GNUmakefile index e0ffcdd9..36fe0d76 100644 --- a/test/GNUmakefile +++ b/test/GNUmakefile @@ -1,4 +1,9 @@ include $(TOOLCHAIN_FILE) +export CC_FOR_TARGET +export LD_FOR_TARGET +export OBJDUMP_FOR_TARGET +export OBJCOPY_FOR_TARGET +export READELF_FOR_TARGET override CC := $(CC_FOR_TARGET) CFLAGS = -O2 -g -Wall -Wextra