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

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

commit ea124c26086afd67ceffa58b62ebc9de78cddab0
Author: Zhaofeng Chen <[email protected]>
AuthorDate: Mon Aug 11 11:35:46 2025 +0000

    examples: simplify makefile for building in STD=y and docker envs.
---
 examples/acipher-rs/ta/Makefile                     | 2 +-
 examples/aes-rs/ta/Makefile                         | 2 +-
 examples/authentication-rs/ta/Makefile              | 2 +-
 examples/big_int-rs/ta/Makefile                     | 2 +-
 examples/build_with_optee_utee_sys-rs/ta/Makefile   | 5 -----
 examples/client_pool-rs/ta/Makefile                 | 2 +-
 examples/diffie_hellman-rs/ta/Makefile              | 2 +-
 examples/digest-rs/ta/Makefile                      | 2 +-
 examples/error_handling-rs/ta/Makefile              | 2 +-
 examples/hotp-rs/ta/Makefile                        | 2 +-
 examples/inter_ta-rs/ta/Makefile                    | 2 +-
 examples/message_passing_interface-rs/host/Makefile | 5 -----
 examples/message_passing_interface-rs/ta/Makefile   | 5 -----
 examples/mnist-rs/ta/inference/Makefile             | 5 -----
 examples/mnist-rs/ta/train/Makefile                 | 5 -----
 examples/property-rs/ta/Makefile                    | 2 +-
 examples/random-rs/ta/Makefile                      | 2 +-
 examples/secure_db_abstraction-rs/host/Makefile     | 5 -----
 examples/secure_db_abstraction-rs/ta/Makefile       | 5 -----
 examples/secure_storage-rs/ta/Makefile              | 2 +-
 examples/serde-rs/host/Makefile                     | 5 -----
 examples/serde-rs/ta/Makefile                       | 5 -----
 examples/signature_verification-rs/ta/Makefile      | 2 +-
 examples/supp_plugin-rs/ta/Makefile                 | 2 +-
 examples/tcp_client-rs/ta/Makefile                  | 2 +-
 examples/time-rs/ta/Makefile                        | 2 +-
 examples/tls_client-rs/host/Makefile                | 5 -----
 examples/tls_client-rs/ta/Makefile                  | 5 -----
 examples/tls_server-rs/host/Makefile                | 5 -----
 examples/tls_server-rs/ta/Makefile                  | 5 -----
 examples/udp_socket-rs/ta/Makefile                  | 2 +-
 projects/web3/eth_wallet/host/Makefile              | 5 -----
 projects/web3/eth_wallet/ta/Makefile                | 5 -----
 33 files changed, 18 insertions(+), 93 deletions(-)

diff --git a/examples/acipher-rs/ta/Makefile b/examples/acipher-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/acipher-rs/ta/Makefile
+++ b/examples/acipher-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/aes-rs/ta/Makefile b/examples/aes-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/aes-rs/ta/Makefile
+++ b/examples/aes-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/authentication-rs/ta/Makefile 
b/examples/authentication-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/authentication-rs/ta/Makefile
+++ b/examples/authentication-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/big_int-rs/ta/Makefile b/examples/big_int-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/big_int-rs/ta/Makefile
+++ b/examples/big_int-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/build_with_optee_utee_sys-rs/ta/Makefile 
b/examples/build_with_optee_utee_sys-rs/ta/Makefile
index b32b1c0..7df5dd0 100644
--- a/examples/build_with_optee_utee_sys-rs/ta/Makefile
+++ b/examples/build_with_optee_utee_sys-rs/ta/Makefile
@@ -27,12 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
 all: ta strip sign
-else
-all:
-       @echo "Please \`unset STD\` then rerun \`source environment\` to build 
the No-STD version"
-endif
 
 ta:
        @cargo build --target $(TARGET) --release --config $(LINKER_CFG) 
$(EXTRA_FLAGS)
diff --git a/examples/client_pool-rs/ta/Makefile 
b/examples/client_pool-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/client_pool-rs/ta/Makefile
+++ b/examples/client_pool-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/diffie_hellman-rs/ta/Makefile 
b/examples/diffie_hellman-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/diffie_hellman-rs/ta/Makefile
+++ b/examples/diffie_hellman-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/digest-rs/ta/Makefile b/examples/digest-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/digest-rs/ta/Makefile
+++ b/examples/digest-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/error_handling-rs/ta/Makefile 
b/examples/error_handling-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/error_handling-rs/ta/Makefile
+++ b/examples/error_handling-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/hotp-rs/ta/Makefile b/examples/hotp-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/hotp-rs/ta/Makefile
+++ b/examples/hotp-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/inter_ta-rs/ta/Makefile b/examples/inter_ta-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/inter_ta-rs/ta/Makefile
+++ b/examples/inter_ta-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/message_passing_interface-rs/host/Makefile 
b/examples/message_passing_interface-rs/host/Makefile
index 57b16fb..13cb4f4 100644
--- a/examples/message_passing_interface-rs/host/Makefile
+++ b/examples/message_passing_interface-rs/host/Makefile
@@ -24,12 +24,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/examples/message_passing_interface-rs/ta/Makefile 
b/examples/message_passing_interface-rs/ta/Makefile
index 42d9236..1050c1f 100644
--- a/examples/message_passing_interface-rs/ta/Makefile
+++ b/examples/message_passing_interface-rs/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)
diff --git a/examples/mnist-rs/ta/inference/Makefile 
b/examples/mnist-rs/ta/inference/Makefile
index 1e6f1bb..5b13bc6 100644
--- a/examples/mnist-rs/ta/inference/Makefile
+++ b/examples/mnist-rs/ta/inference/Makefile
@@ -30,12 +30,7 @@ SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/../target/$(TARGET)/release
 
 
-ifeq ($(STD),)
 all: ta strip sign
-else
-all:
-       @echo "Please \`unset STD\` then rerun \`source environment\` to build 
the No-STD version"
-endif
 
 ta:
        @cargo build --target $(TARGET) --release --config $(LINKER_CFG) 
$(EXTRA_FLAGS)
diff --git a/examples/mnist-rs/ta/train/Makefile 
b/examples/mnist-rs/ta/train/Makefile
index 4b8bbd4..0e8c6ab 100644
--- a/examples/mnist-rs/ta/train/Makefile
+++ b/examples/mnist-rs/ta/train/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/../target/$(TARGET)/release
 
-ifeq ($(STD),)
 all: ta strip sign
-else
-all:
-       @echo "Please \`unset STD\` then rerun \`source environment\` to build 
the No-STD version"
-endif
 
 ta:
        @cargo build --target $(TARGET) --release --config $(LINKER_CFG) 
$(EXTRA_FLAGS)
diff --git a/examples/property-rs/ta/Makefile b/examples/property-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/property-rs/ta/Makefile
+++ b/examples/property-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/random-rs/ta/Makefile b/examples/random-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/random-rs/ta/Makefile
+++ b/examples/random-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/secure_db_abstraction-rs/host/Makefile 
b/examples/secure_db_abstraction-rs/host/Makefile
index c8b90ce..25f73cd 100644
--- a/examples/secure_db_abstraction-rs/host/Makefile
+++ b/examples/secure_db_abstraction-rs/host/Makefile
@@ -26,12 +26,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/examples/secure_db_abstraction-rs/ta/Makefile 
b/examples/secure_db_abstraction-rs/ta/Makefile
index 42d9236..1050c1f 100644
--- a/examples/secure_db_abstraction-rs/ta/Makefile
+++ b/examples/secure_db_abstraction-rs/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)
diff --git a/examples/secure_storage-rs/ta/Makefile 
b/examples/secure_storage-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/secure_storage-rs/ta/Makefile
+++ b/examples/secure_storage-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/serde-rs/host/Makefile b/examples/serde-rs/host/Makefile
index 1ff57fe..c377862 100644
--- a/examples/serde-rs/host/Makefile
+++ b/examples/serde-rs/host/Makefile
@@ -24,12 +24,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/examples/serde-rs/ta/Makefile b/examples/serde-rs/ta/Makefile
index 42d9236..1050c1f 100644
--- a/examples/serde-rs/ta/Makefile
+++ b/examples/serde-rs/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)
diff --git a/examples/signature_verification-rs/ta/Makefile 
b/examples/signature_verification-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/signature_verification-rs/ta/Makefile
+++ b/examples/signature_verification-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/supp_plugin-rs/ta/Makefile 
b/examples/supp_plugin-rs/ta/Makefile
index 1b16c21..e0932ed 100644
--- a/examples/supp_plugin-rs/ta/Makefile
+++ b/examples/supp_plugin-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/tcp_client-rs/ta/Makefile 
b/examples/tcp_client-rs/ta/Makefile
index e69d885..44e8cdb 100644
--- a/examples/tcp_client-rs/ta/Makefile
+++ b/examples/tcp_client-rs/ta/Makefile
@@ -29,7 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/time-rs/ta/Makefile b/examples/time-rs/ta/Makefile
index 029e66d..bd3c016 100644
--- a/examples/time-rs/ta/Makefile
+++ b/examples/time-rs/ta/Makefile
@@ -27,7 +27,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/examples/tls_client-rs/host/Makefile 
b/examples/tls_client-rs/host/Makefile
index 7f0f46c..d49f18f 100644
--- a/examples/tls_client-rs/host/Makefile
+++ b/examples/tls_client-rs/host/Makefile
@@ -24,12 +24,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/examples/tls_client-rs/ta/Makefile 
b/examples/tls_client-rs/ta/Makefile
index 42d9236..1050c1f 100644
--- a/examples/tls_client-rs/ta/Makefile
+++ b/examples/tls_client-rs/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)
diff --git a/examples/tls_server-rs/host/Makefile 
b/examples/tls_server-rs/host/Makefile
index e160abf..946bde9 100644
--- a/examples/tls_server-rs/host/Makefile
+++ b/examples/tls_server-rs/host/Makefile
@@ -24,12 +24,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/examples/tls_server-rs/ta/Makefile 
b/examples/tls_server-rs/ta/Makefile
index 42d9236..1050c1f 100644
--- a/examples/tls_server-rs/ta/Makefile
+++ b/examples/tls_server-rs/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)
diff --git a/examples/udp_socket-rs/ta/Makefile 
b/examples/udp_socket-rs/ta/Makefile
index e69d885..44e8cdb 100644
--- a/examples/udp_socket-rs/ta/Makefile
+++ b/examples/udp_socket-rs/ta/Makefile
@@ -29,7 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-BUILDER = $(if $(STD),xargo,cargo)
+BUILDER ?= $(if $(STD),xargo,cargo)
 
 all: ta strip sign
 
diff --git a/projects/web3/eth_wallet/host/Makefile 
b/projects/web3/eth_wallet/host/Makefile
index 3f2f431..1e4d8b8 100644
--- a/projects/web3/eth_wallet/host/Makefile
+++ b/projects/web3/eth_wallet/host/Makefile
@@ -24,12 +24,7 @@ LINKER_CFG := target.$(TARGET).linker=\"$(CROSS_COMPILE)gcc\"
 
 OUT_DIR := $(CURDIR)/target/$(TARGET)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: host strip
-endif
 
 host:
        @cargo build --target $(TARGET_HOST) --release --config $(LINKER_CFG)
diff --git a/projects/web3/eth_wallet/ta/Makefile 
b/projects/web3/eth_wallet/ta/Makefile
index d948521..8f28809 100644
--- a/projects/web3/eth_wallet/ta/Makefile
+++ b/projects/web3/eth_wallet/ta/Makefile
@@ -29,12 +29,7 @@ TA_SIGN_KEY ?= $(TA_DEV_KIT_DIR)/keys/default_ta.pem
 SIGN := $(TA_DEV_KIT_DIR)/scripts/sign_encrypt.py
 OUT_DIR := $(CURDIR)/target/$(TARGET_TA)/release
 
-ifeq ($(STD),)
-all:
-       @echo "Please \`export STD=y\` then rerun \`source environment\` to 
build the STD version"
-else
 all: ta strip sign
-endif
 
 ta:
        @xargo build --target $(TARGET) --release --config $(LINKER_CFG)


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

Reply via email to