Skip to content

Commit

Permalink
boards: make: with workspace no --target-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
bradjc committed Jul 11, 2024
1 parent b93ba2f commit add0d53
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions boards/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ else
RUSTUP ?= true
endif

# Default location of target directory (relative to board makefile) passed to
# cargo `--target_dir`.
# Default location of target directory (relative to board makefile).
TARGET_DIRECTORY ?= $(TOCK_ROOT_DIRECTORY)target/

# RUSTC_FLAGS allows boards to define board-specific options.
Expand Down Expand Up @@ -233,8 +232,7 @@ CARGO_FLAGS ?=
CARGO_FLAGS_TOCK ?= \
$(VERBOSE_FLAGS) \
--target=$(TARGET) \
--package $(PLATFORM) \
--target-dir=$(TARGET_DIRECTORY) $(CARGO_FLAGS)
--package $(PLATFORM)

# Add default flags to rustdoc.
RUSTDOC_FLAGS_TOCK ?= -D warnings --document-private-items
Expand Down Expand Up @@ -365,7 +363,7 @@ check:

.PHONY: clean
clean::
$(Q)$(CARGO) clean $(VERBOSE_FLAGS) --target-dir=$(TARGET_DIRECTORY)
$(Q)$(CARGO) clean $(VERBOSE_FLAGS)

.PHONY: release
release: $(TARGET_PATH)/release/$(PLATFORM).bin
Expand Down

0 comments on commit add0d53

Please sign in to comment.