fixup! firmware: use cargo build-std instead

Signed-off-by: Steve Fan <sf@m-labs.hk>
m-labs · Nov 26, 2021 · 359aa17 · 359aa17
1 parent a828fa4
commit 359aa17
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 15 deletions.
diff --git a/artiq/firmware/Cargo.lock b/artiq/firmware/Cargo.lock
diff --git a/artiq/firmware/bootloader/Makefile b/artiq/firmware/bootloader/Makefile
@@ -3,8 +3,6 @@ include $(MISOC_DIRECTORY)/software/common.mak
 
 RUSTFLAGS += -Cpanic=abort
 
-export XBUILD_SYSROOT_PATH=$(BUILDINC_DIRECTORY)/../sysroot
-
 all:: bootloader.bin
 
 cargo = cargo build -Z build-std=core

diff --git a/artiq/firmware/ksupport/Makefile b/artiq/firmware/ksupport/Makefile
@@ -14,8 +14,6 @@ LDFLAGS += --eh-frame-hdr \
 
 RUSTFLAGS += -Cpanic=unwind
 
-export XBUILD_SYSROOT_PATH=$(BUILDINC_DIRECTORY)/../sysroot
-
 all:: ksupport.elf
 
 cargo = cargo build -Z build-std=core,alloc

diff --git a/artiq/firmware/runtime/Makefile b/artiq/firmware/runtime/Makefile
@@ -10,8 +10,6 @@ LDFLAGS += \
 
 RUSTFLAGS += -Cpanic=unwind
 
-export XBUILD_SYSROOT_PATH=$(BUILDINC_DIRECTORY)/../sysroot
-
 all:: runtime.bin runtime.fbi
 
 cargo = cargo build -Z build-std=core,alloc

diff --git a/artiq/firmware/satman/Makefile b/artiq/firmware/satman/Makefile
@@ -5,8 +5,6 @@ LDFLAGS += -L../libbase
 
 RUSTFLAGS += -Cpanic=abort
 
-export XBUILD_SYSROOT_PATH=$(BUILDINC_DIRECTORY)/../sysroot
-
 all:: satman.bin satman.fbi
 
 cargo = cargo build -Z build-std=core