This is an automated email from the ASF dual-hosted git repository.

yuanz pushed a commit to branch no-std
in repository 
https://gitbox.apache.org/repos/asf/incubator-teaclave-trustzone-sdk.git

commit e7604c1c6bb7ac8ba6533fbff43243b35dbd163a
Author: Sumit Garg <[email protected]>
AuthorDate: Wed Dec 27 18:06:18 2023 +0530

    examples: std TAs: Add toochain override for nightly-2021-09-20
    
    This will allow us to upgrade toolchain for non_std TAs while keeping
    std TAs tied to a fixed nightly release until corresponding rust
    toolchain target lands upstream.
    
    Signed-off-by: Sumit Garg <[email protected]>
---
 examples/message_passing_interface-rs/ta/Makefile | 4 +++-
 examples/serde-rs/ta/Makefile                     | 4 +++-
 examples/tcp_client-rs/ta/Cargo.toml              | 1 -
 examples/tcp_client-rs/ta/Makefile                | 4 +++-
 examples/tls_client-rs/ta/Makefile                | 4 +++-
 examples/tls_server-rs/ta/Makefile                | 4 +++-
 examples/udp_socket-rs/ta/Makefile                | 4 +++-
 7 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/examples/message_passing_interface-rs/ta/Makefile 
b/examples/message_passing_interface-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/message_passing_interface-rs/ta/Makefile
+++ b/examples/message_passing_interface-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta
diff --git a/examples/serde-rs/ta/Makefile b/examples/serde-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/serde-rs/ta/Makefile
+++ b/examples/serde-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta
diff --git a/examples/tcp_client-rs/ta/Cargo.toml 
b/examples/tcp_client-rs/ta/Cargo.toml
index 6a75dbb..a4c8ffd 100644
--- a/examples/tcp_client-rs/ta/Cargo.toml
+++ b/examples/tcp_client-rs/ta/Cargo.toml
@@ -35,5 +35,4 @@ uuid = { version = "0.8" }
 proto = { path = "../proto" }
 
 [profile.release]
-lto = true
 opt-level = 1
diff --git a/examples/tcp_client-rs/ta/Makefile 
b/examples/tcp_client-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/tcp_client-rs/ta/Makefile
+++ b/examples/tcp_client-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta
diff --git a/examples/tls_client-rs/ta/Makefile 
b/examples/tls_client-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/tls_client-rs/ta/Makefile
+++ b/examples/tls_client-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta
diff --git a/examples/tls_server-rs/ta/Makefile 
b/examples/tls_server-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/tls_server-rs/ta/Makefile
+++ b/examples/tls_server-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta
diff --git a/examples/udp_socket-rs/ta/Makefile 
b/examples/udp_socket-rs/ta/Makefile
index 9496d57..d2d1dc0 100644
--- a/examples/udp_socket-rs/ta/Makefile
+++ b/examples/udp_socket-rs/ta/Makefile
@@ -42,7 +42,9 @@ OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 all: ta strip sign
 
 ta:
-       @xargo build --target $(TARGET) --release --verbose --config 
$(LINKER_CFG)
+       rustup override set nightly-2021-09-20
+       @xargo build --target $(TARGET) --release --verbose -Z unstable-options 
--config $(LINKER_CFG)
+       rustup override unset
 
 strip:
        @$(OBJCOPY) --strip-unneeded $(OUT_DIR)/ta $(OUT_DIR)/stripped_ta


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to