github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-22 03:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4053 from ManaSugi/fix-makefile-for-features

Browse Source 
agent: Allow the agent to be rebuilt with the change of Cargo features
This commit is contained in:
Peng Tao 2022-04-08 15:38:25 +08:00 committed by GitHub
commit 95e45fab38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/agent/Makefile
View File

@ -14,10 +14,6 @@ PROJECT_COMPONENT = kata-agent
TARGET = $(PROJECT_COMPONENT) TARGET = $(PROJECT_COMPONENT)
SOURCES := \
$(shell find . 2>&1 | grep -E '.*\.rs$$') \
Cargo.toml
VERSION_FILE := ./VERSION VERSION_FILE := ./VERSION
VERSION := $(shell grep -v ^\# $(VERSION_FILE)) VERSION := $(shell grep -v ^\# $(VERSION_FILE))
COMMIT_NO := $(shell git rev-parse HEAD 2>/dev/null || true) COMMIT_NO := $(shell git rev-parse HEAD 2>/dev/null || true)
@ -38,7 +34,7 @@ ifeq ($(SECCOMP),yes)
endif endif
ifneq ($(EXTRA_RUSTFEATURES),) ifneq ($(EXTRA_RUSTFEATURES),)
override EXTRA_RUSTFEATURES := --features $(EXTRA_RUSTFEATURES) override EXTRA_RUSTFEATURES := --features "$(EXTRA_RUSTFEATURES)"
endif endif
include ../../utils.mk include ../../utils.mk
@ -108,14 +104,14 @@ $(TARGET): $(GENERATED_CODE) logging-crate-tests $(TARGET_PATH)
logging-crate-tests: logging-crate-tests:
make -C $(CWD)/../libs/logging make -C $(CWD)/../libs/logging
$(TARGET_PATH): $(SOURCES) | show-summary $(TARGET_PATH): show-summary
@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) @RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES)
$(GENERATED_FILES): %: %.in $(GENERATED_FILES): %: %.in
@sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@" @sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@"
##TARGET optimize: optimized build ##TARGET optimize: optimized build
optimize: $(SOURCES) | show-summary show-header optimize: show-summary show-header
@RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES) @RUSTFLAGS="-C link-arg=-s $(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) --$(BUILD_TYPE) $(EXTRA_RUSTFEATURES)
##TARGET install: install agent ##TARGET install: install agent