mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
fix qemu building with older make
The $(or ...) builtin (uses introduced by commitsffbf089357and8962a8f951) is supported only from make 3.81 onwards, yet we claim to only require make 3.80. Introduce a good enough fallback. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
1 parent
8b24b07eef
commit
1b7fe9a1a1
1 file changed
+5
-4
@@ -12,6 +12,7 @@ space := $(empty) $(empty)
|
||||
|
||||
# fallback for older make
|
||||
realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
|
||||
or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$(3),$(if $(strip $(4)),$(4)))))
|
||||
|
||||
-include $(XEN_ROOT)/.config
|
||||
|
||||
@@ -266,11 +267,11 @@ QEMU_TRADITIONAL_REVISION ?= d0395cc49b2ec6d1723c01f1daf2394b9264ca29
|
||||
# QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
|
||||
|
||||
# Defaults for subtree locations
|
||||
QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\
|
||||
$(QEMU_TRADITIONAL_URL))
|
||||
QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
|
||||
$(QEMU_TRADITIONAL_URL))
|
||||
|
||||
QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\
|
||||
$(QEMU_UPSTREAM_URL))
|
||||
QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\
|
||||
$(QEMU_UPSTREAM_URL))
|
||||
|
||||
# Short answer -- do not enable this unless you know what you are
|
||||
# doing and are prepared for some pain.
|
||||
|
||||