Skip to content

Commit c104569

Browse files
committed
Makefile: change the artifact target to prevent guestagent creation from being affected by .config.
Signed-off-by: Norio Nomura <[email protected]>
1 parent 337f01a commit c104569

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,16 @@ MKDIR_TARGETS += _output/bin
232232
# _output/share/lima/lima-guestagent
233233
LINUX_GUESTAGENT_PATH_COMMON = _output/share/lima/lima-guestagent.Linux-
234234

235+
GUESTAGENT_ARCHS = aarch64 armv7l riscv64 x86_64
236+
NATIVE_GUESTAGENT_ARCH = $(shell uname -m | sed -e s/arm64/aarch64/)
237+
NATIVE_GUESTAGENT = $(LINUX_GUESTAGENT_PATH_COMMON)$(NATIVE_GUESTAGENT_ARCH)
238+
ADDITIONAL_GUESTAGENT_ARCHS = $(filter-out $(NATIVE_GUESTAGENT_ARCH),$(GUESTAGENT_ARCHS))
239+
ADDITIONAL_GUESTAGENTS = $(addprefix $(LINUX_GUESTAGENT_PATH_COMMON),$(ADDITIONAL_GUESTAGENT_ARCHS))
240+
235241
# How to add architecure specific guestagent:
236242
# 1. Add the architecture to GUESTAGENT_ARCHS
237243
# 2. Add ENVS_$(LINUX_GUESTAGENT_PATH_COMMON)<arch> to set GOOS, GOARCH, and other necessary environment variables
238244
ifeq ($(CONFIG_GUESTAGENT_OS_LINUX),y)
239-
GUESTAGENT_ARCHS = aarch64 armv7l riscv64 x86_64
240-
NATIVE_GUESTAGENT_ARCH = $(shell uname -m | sed -e s/arm64/aarch64/)
241-
ADDITIONAL_GUESTAGENT_ARCHS = $(filter-out $(NATIVE_GUESTAGENT_ARCH),$(GUESTAGENT_ARCHS))
242245

243246
# CONFIG_GUESTAGENT_ARCH_<arch> naming convention: uppercase, remove '_'
244247
config_guestagent_arch_name = CONFIG_GUESTAGENT_ARCH_$(shell echo $(1)|tr -d _|tr a-z A-Z)
@@ -249,10 +252,9 @@ guestagent_path = $(if $(findstring y,$($(call config_guestagent_arch_name,$(1))
249252

250253
# apply CONFIG_GUESTAGENT_ARCH_*
251254
GUESTAGENTS = $(foreach arch,$(GUESTAGENT_ARCHS),$(call guestagent_path,$(arch)))
252-
NATIVE_GUESTAGENT=$(LINUX_GUESTAGENT_PATH_COMMON)$(NATIVE_GUESTAGENT_ARCH)
253-
ADDITIONAL_GUESTAGENTS=$(addprefix $(LINUX_GUESTAGENT_PATH_COMMON),$(ADDITIONAL_GUESTAGENT_ARCHS))
254255
endif
255256

257+
256258
.PHONY: guestagents native-guestagent additional-guestagents
257259
guestagents: $(GUESTAGENTS)
258260
native-guestagent: $(NATIVE_GUESTAGENT)

0 commit comments

Comments
 (0)