use cargo build-std

DemesneGH · Jun 21, 2024 · fb8022c · fb8022c
1 parent 9f5c62c
commit fb8022c
Show file tree

Hide file tree

Showing 40 changed files with 24 additions and 496 deletions.
diff --git a/environment b/environment
@@ -17,7 +17,10 @@
 
 export PATH=$PATH:$HOME/.cargo/bin
 export RUST_TARGET_PATH="$(pwd)"
-export RUST_COMPILER_RT_ROOT=$RUST_TARGET_PATH/rust/rust/src/llvm-project/compiler-rt
+#export RUST_COMPILER_RT_ROOT=$RUST_TARGET_PATH/rust/rust/src/llvm-project/compiler-rt
+# for cargo build-std, set the Rust src path
+export __CARGO_TESTS_ONLY_SRC_ROOT="$(pwd)/rust/rust"
+
 if [ -z "$OPTEE_DIR" ]
 then
   export OPTEE_DIR="$(pwd)/optee"

diff --git a/examples/acipher-rs/ta/Makefile b/examples/acipher-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/acipher-rs/ta/Xargo.toml b/examples/acipher-rs/ta/Xargo.toml
diff --git a/examples/aes-rs/ta/Makefile b/examples/aes-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/aes-rs/ta/Xargo.toml b/examples/aes-rs/ta/Xargo.toml
diff --git a/examples/authentication-rs/ta/Makefile b/examples/authentication-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/authentication-rs/ta/Xargo.toml b/examples/authentication-rs/ta/Xargo.toml
diff --git a/examples/big_int-rs/ta/Makefile b/examples/big_int-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/big_int-rs/ta/Xargo.toml b/examples/big_int-rs/ta/Xargo.toml
diff --git a/examples/diffie_hellman-rs/ta/Makefile b/examples/diffie_hellman-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/diffie_hellman-rs/ta/Xargo.toml b/examples/diffie_hellman-rs/ta/Xargo.toml
diff --git a/examples/digest-rs/ta/Makefile b/examples/digest-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/digest-rs/ta/Xargo.toml b/examples/digest-rs/ta/Xargo.toml
diff --git a/examples/hello_world-rs/ta/Makefile b/examples/hello_world-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/hello_world-rs/ta/Xargo.toml b/examples/hello_world-rs/ta/Xargo.toml
diff --git a/examples/hotp-rs/ta/Makefile b/examples/hotp-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/hotp-rs/ta/Xargo.toml b/examples/hotp-rs/ta/Xargo.toml
diff --git a/examples/message_passing_interface-rs/ta/Makefile b/examples/message_passing_interface-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/message_passing_interface-rs/ta/Xargo.toml b/examples/message_passing_interface-rs/ta/Xargo.toml
diff --git a/examples/random-rs/ta/Makefile b/examples/random-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/random-rs/ta/Xargo.toml b/examples/random-rs/ta/Xargo.toml
diff --git a/examples/secure_storage-rs/ta/Makefile b/examples/secure_storage-rs/ta/Makefile
@@ -40,7 +40,7 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-	@xargo build --target $(TARGET) --release --verbose
+	@cargo build -Z build-std=std,panic_abort --target $(TARGET) --release
 
 strip:
 	@$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta

diff --git a/examples/secure_storage-rs/ta/Xargo.toml b/examples/secure_storage-rs/ta/Xargo.toml