diff options
Diffstat (limited to 'external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch')
| -rw-r--r-- | external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch b/external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch index 838cbdc9..bd7a6c57 100644 --- a/external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch +++ b/external/meta-virtualization/recipes-containers/criu/files/0001-criu-Fix-toolchain-hardcode.patch @@ -46,17 +46,20 @@ diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk index 56dba84..1698821 100644 --- a/scripts/nmk/scripts/tools.mk +++ b/scripts/nmk/scripts/tools.mk -@@ -2,31 +2,31 @@ ifndef ____nmk_defined__tools +@@ -2,35 +2,35 @@ ifndef ____nmk_defined__tools # # System tools shorthands -RM := rm -f +RM ?= rm -f HOSTLD ?= ld --LD := $(CROSS_COMPILE)$(HOSTLD) -+LD ?= $(CROSS_COMPILE)$(HOSTLD) + ifeq ($(origin LD), default) + LD := $(CROSS_COMPILE)$(HOSTLD) + endif HOSTCC ?= gcc --CC := $(CROSS_COMPILE)$(HOSTCC) + ifeq ($(origin CC), default) + CC := $(CROSS_COMPILE)$(HOSTCC) + endif -CPP := $(CC) -E -AS := $(CROSS_COMPILE)as -AR := $(CROSS_COMPILE)ar @@ -69,7 +72,6 @@ index 56dba84..1698821 100644 -AWK := awk -PERL := perl -FULL_PYTHON := $(shell which python2 2>/dev/null || which python3 2>/dev/null) -+CC ?= $(CROSS_COMPILE)$(HOSTCC) +CPP ?= $(CC) -E +AS ?= $(CROSS_COMPILE)as +AR ?= $(CROSS_COMPILE)ar |