Skip to content

Commit 6f8341d

Browse files
committed
driver(build): limactl should not depend on additional-drivers target
Signed-off-by: Ansuman Sahoo <[email protected]>
1 parent a00df8e commit 6f8341d

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

Makefile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ binaries: limactl helpers guestagents \
167167
################################################################################
168168
# _output/bin
169169
.PHONY: limactl lima helpers
170-
limactl: _output/bin/limactl$(exe) external-drivers lima
170+
limactl: _output/bin/limactl$(exe) lima
171171

172172
### Listing Dependencies
173173

@@ -242,13 +242,13 @@ endif
242242
ENVS__output/bin/limactl$(exe) = CGO_ENABLED=1 GOOS="$(GOOS)" GOARCH="$(GOARCH)" CC="$(CC)"
243243

244244
LIMACTL_DRIVER_TAGS :=
245-
ifneq (,$(findstring vz,$(EXTERNAL_DRIVERS)))
245+
ifneq (,$(findstring vz,$(ADDITIONAL_DRIVERS)))
246246
LIMACTL_DRIVER_TAGS += external_vz
247247
endif
248-
ifneq (,$(findstring qemu,$(EXTERNAL_DRIVERS)))
248+
ifneq (,$(findstring qemu,$(ADDITIONAL_DRIVERS)))
249249
LIMACTL_DRIVER_TAGS += external_qemu
250250
endif
251-
ifneq (,$(findstring wsl2,$(EXTERNAL_DRIVERS)))
251+
ifneq (,$(findstring wsl2,$(ADDITIONAL_DRIVERS)))
252252
LIMACTL_DRIVER_TAGS += external_wsl2
253253
endif
254254

@@ -268,18 +268,16 @@ endif
268268

269269
DRIVER_INSTALL_DIR := _output/libexec/lima
270270

271-
.PHONY: external-drivers
272-
external-drivers:
273-
ifneq ($(EXTERNAL_DRIVERS),)
271+
.PHONY: additional-drivers
272+
additional-drivers:
274273
@mkdir -p $(DRIVER_INSTALL_DIR)
275-
@for drv in $(EXTERNAL_DRIVERS); do \
274+
@for drv in $(ADDITIONAL_DRIVERS); do \
276275
echo "Building $$drv as external"; \
277276
$(GO_BUILD) -o $(DRIVER_INSTALL_DIR)/lima-driver-$$drv ./cmd/lima-driver-$$drv; \
278277
if [ "$$drv" = "vz" ]; then \
279278
codesign -f -v --entitlements vz.entitlements -s - $(DRIVER_INSTALL_DIR)/lima-driver-vz; \
280279
fi; \
281280
done
282-
endif
283281

284282
LIMA_CMDS = $(sort lima lima$(bat)) # $(sort ...) deduplicates the list
285283
LIMA_DEPS = $(addprefix _output/bin/,$(LIMA_CMDS))

0 commit comments

Comments
 (0)