Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-25 10:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disambiguate runner args from krun args in Makefile

Browse Source
This commit is contained in:
Zhang Junyang
2024-01-28 14:54:38 +08:00
committed by Tate, Hongliang Tian
parent 9cfb503561
commit 4835e48be1
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -42,30 +42,30 @@ CARGO_KBUILD_ARGS += --release
CARGO_KRUN_ARGS += --release CARGO_KRUN_ARGS += --release
endif endif
CARGO_KRUN_ARGS += -- '$(KERNEL_CMDLINE) -- $(INIT_CMDLINE)' ifeq ($(INTEL_TDX), 1)
CARGO_KRUN_ARGS += --boot-method="$(BOOT_METHOD)" CARGO_KBUILD_ARGS += --features intel_tdx
CARGO_KRUN_ARGS += --boot-protocol="$(BOOT_PROTOCOL)" CARGO_KRUN_ARGS += --features intel_tdx
endif
RUNNER_ARGS := '$(KERNEL_CMDLINE) -- $(INIT_CMDLINE)'
RUNNER_ARGS += --boot-method="$(BOOT_METHOD)"
RUNNER_ARGS += --boot-protocol="$(BOOT_PROTOCOL)"
ifeq ($(EMULATE_IOMMU), 1) ifeq ($(EMULATE_IOMMU), 1)
CARGO_KRUN_ARGS += --emulate-iommu RUNNER_ARGS += --emulate-iommu
endif endif
ifeq ($(ENABLE_KVM), 1) ifeq ($(ENABLE_KVM), 1)
CARGO_KRUN_ARGS += --enable-kvm RUNNER_ARGS += --enable-kvm
endif endif
ifeq ($(GDB_SERVER), 1) ifeq ($(GDB_SERVER), 1)
ENABLE_KVM := 0 ENABLE_KVM := 0
CARGO_KRUN_ARGS += --halt-for-gdb RUNNER_ARGS += --halt-for-gdb
endif endif
ifeq ($(GDB_CLIENT), 1) ifeq ($(GDB_CLIENT), 1)
CARGO_KRUN_ARGS += --run-gdb-client RUNNER_ARGS += --run-gdb-client
endif
ifeq ($(INTEL_TDX), 1)
CARGO_KBUILD_ARGS += --features intel_tdx
CARGO_KRUN_ARGS += --features intel_tdx
endif endif
ifeq ($(KTEST), 1) ifeq ($(KTEST), 1)
@ -74,7 +74,7 @@ GLOBAL_RUSTC_FLAGS += --cfg ktest --cfg ktest=\"$(subst $(comma),\" --cfg ktest=
endif endif
ifeq ($(SKIP_GRUB_MENU), 1) ifeq ($(SKIP_GRUB_MENU), 1)
CARGO_KRUN_ARGS += --skip-grub-menu RUNNER_ARGS += --skip-grub-menu
endif endif
# Pass make variables to all subdirectory makes # Pass make variables to all subdirectory makes
@ -118,7 +118,7 @@ tools:
@cd services/libs/comp-sys && cargo install --path cargo-component @cd services/libs/comp-sys && cargo install --path cargo-component
run: build run: build
@RUSTFLAGS="$(GLOBAL_RUSTC_FLAGS)" cargo krun $(CARGO_KRUN_ARGS) @RUSTFLAGS="$(GLOBAL_RUSTC_FLAGS)" cargo krun $(CARGO_KRUN_ARGS) -- $(RUNNER_ARGS)
test: test:
@for dir in $(USERMODE_TESTABLE); do \ @for dir in $(USERMODE_TESTABLE); do \