Skip to content

Commit

Permalink
make: enable make tab on stable
Browse files Browse the repository at this point in the history
Unfortunately without --out-dir we cannot run `make tab` with parallel
builds.
  • Loading branch information
bradjc committed Mar 13, 2024
1 parent 43ab41d commit 2568643
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ endif

ifndef DEBUG
release=--release
artifact_dir=release
else
artifact_dir=debug
endif

# Rustup currently lacks the locking needed for concurrent use:
Expand Down Expand Up @@ -187,7 +190,9 @@ $(call fixed-target, F=0x10020000 R=0x20004000 T=thumbv6m-none-eabi A=cortex-m0)
$(call fixed-target, F=0x10028000 R=0x2000c000 T=thumbv6m-none-eabi A=cortex-m0)

$(ELF_TARGETS): toolchain
LIBTOCK_LINKER_FLASH=$(F) LIBTOCK_LINKER_RAM=$(R) cargo build --example $(EXAMPLE) $(features) --target=$(T) $(release) --out-dir target/$(A).$(F).$(R) -Z unstable-options
LIBTOCK_LINKER_FLASH=$(F) LIBTOCK_LINKER_RAM=$(R) cargo build --example $(EXAMPLE) $(features) --target=$(T) $(release)
@mkdir -p target/$(A).$(F).$(R)/
@cp target/$(T)/$(artifact_dir)/examples/$(EXAMPLE) target/$(A).$(F).$(R)/
$(eval ELF_LIST += target/$(A).$(F).$(R)/$(EXAMPLE),$(A).$(F).$(R))

.PHONY: tab
Expand Down

0 comments on commit 2568643

Please sign in to comment.