Merge pull request #538 from tock/make-tab-stable

make: enable make tab on stable

Makefile

@@ -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:
@@ -187,9 +190,11 @@ $(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))
-
+# This target (`make tab`) is not parallel-safe
 .PHONY: tab
 tab: $(ELF_TARGETS)
 	mkdir -p target/tab