Merge pull request #403 from ymwjbxxq/ymwjbxxq-fix-rust-arm64-cross-compiler

Rust: align all rust examples to use zigbuild for cross compilation

Author: jbesw

apigw-http-api-lambda-rust/Makefile

@@ -1,8 +1,16 @@
 FUNCTIONS := handler
 ARCH := aarch64-unknown-linux-gnu
+ARCH_SPLIT = $(subst -, ,$(ARCH))
 
 build:
-	cross build --release --target $(ARCH)
+ifeq ("$(shell zig targets | jq -r .native.cpu.arch)-$(shell zig targets | jq -r .native.os)-$(shell zig targets | jq -r .native.abi)", "$(word 1,$(ARCH_SPLIT))-$(word 3,$(ARCH_SPLIT))-$(word 4,$(ARCH_SPLIT))")
+	@echo "Same host and target. Using native build"
+	cargo build --release --target $(ARCH)
+else
+	@echo "Different host and target. Using zigbuild"
+	cargo zigbuild --release --target $(ARCH)
+endif
+
 	rm -rf ./build
 	mkdir -p ./build
 	${MAKE} ${MAKEOPTS} $(foreach function,${FUNCTIONS}, build-${function})

apigw-http-api-lambda-rust/README.md

@@ -12,6 +12,8 @@ Important: this application uses various AWS services and there are costs associ
 * [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) installed and configured
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
+* [Rust](https://www.rust-lang.org/) 1.56.0 or higher
+* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
 
 ## Deployment Instructions
 
@@ -23,7 +25,7 @@ Important: this application uses various AWS services and there are costs associ
     ```
     cd apigw-http-api-lambda-rust
     ```
-3. Install dependencies and build (docker and cross build are required):
+3. Install dependencies and build:
     ```
     make build
     ```

lambda-s3-rust/Makefile

@@ -1,8 +1,16 @@
 FUNCTIONS := handler
 ARCH := aarch64-unknown-linux-gnu
+ARCH_SPLIT = $(subst -, ,$(ARCH))
 
 build:
-	cross build --release --target $(ARCH)
+ifeq ("$(shell zig targets | jq -r .native.cpu.arch)-$(shell zig targets | jq -r .native.os)-$(shell zig targets | jq -r .native.abi)", "$(word 1,$(ARCH_SPLIT))-$(word 3,$(ARCH_SPLIT))-$(word 4,$(ARCH_SPLIT))")
+	@echo "Same host and target. Using native build"
+	cargo build --release --target $(ARCH)
+else
+	@echo "Different host and target. Using zigbuild"
+	cargo zigbuild --release --target $(ARCH)
+endif
+
 	rm -rf ./build
 	mkdir -p ./build
 	${MAKE} ${MAKEOPTS} $(foreach function,${FUNCTIONS}, build-${function})

lambda-s3-rust/README.md

@@ -12,6 +12,8 @@ Important: this application uses various AWS services and there are costs associ
 * [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) installed and configured
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
+* [Rust](https://www.rust-lang.org/) 1.56.0 or higher
+* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
 
 ## Deployment Instructions
 
@@ -23,7 +25,7 @@ Important: this application uses various AWS services and there are costs associ
     ```
     cd lambda-s3-rust
     ```
-3. Install dependencies and build (docker and cross build are required):
+3. Install dependencies and build:
     ```
     make build
     ```

lambda-sfn-rust/Makefile

@@ -1,8 +1,16 @@
 FUNCTIONS := handler
 ARCH := aarch64-unknown-linux-gnu
+ARCH_SPLIT = $(subst -, ,$(ARCH))
 
 build:
-	cross build --release --target $(ARCH)
+ifeq ("$(shell zig targets | jq -r .native.cpu.arch)-$(shell zig targets | jq -r .native.os)-$(shell zig targets | jq -r .native.abi)", "$(word 1,$(ARCH_SPLIT))-$(word 3,$(ARCH_SPLIT))-$(word 4,$(ARCH_SPLIT))")
+	@echo "Same host and target. Using native build"
+	cargo build --release --target $(ARCH)
+else
+	@echo "Different host and target. Using zigbuild"
+	cargo zigbuild --release --target $(ARCH)
+endif
+
 	rm -rf ./build
 	mkdir -p ./build
 	${MAKE} ${MAKEOPTS} $(foreach function,${FUNCTIONS}, build-${function})

lambda-sfn-rust/README.md

@@ -12,6 +12,8 @@ Important: this application uses various AWS services and there are costs associ
 * [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) installed and configured
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
+* [Rust](https://www.rust-lang.org/) 1.56.0 or higher
+* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
 
 ## Deployment Instructions
 
@@ -23,7 +25,7 @@ Important: this application uses various AWS services and there are costs associ
     ```
     cd lambda-sfn-rust
     ```
-3. Install dependencies and build (docker and cross build are required):
+3. Install dependencies and build:
     ```
     make build
     ```

lambda-sqs-rust/Makefile

@@ -1,8 +1,16 @@
 FUNCTIONS := handler
 ARCH := aarch64-unknown-linux-gnu
+ARCH_SPLIT = $(subst -, ,$(ARCH))
 
 build:
-	cross build --release --target $(ARCH)
+ifeq ("$(shell zig targets | jq -r .native.cpu.arch)-$(shell zig targets | jq -r .native.os)-$(shell zig targets | jq -r .native.abi)", "$(word 1,$(ARCH_SPLIT))-$(word 3,$(ARCH_SPLIT))-$(word 4,$(ARCH_SPLIT))")
+	@echo "Same host and target. Using native build"
+	cargo build --release --target $(ARCH)
+else
+	@echo "Different host and target. Using zigbuild"
+	cargo zigbuild --release --target $(ARCH)
+endif
+
 	rm -rf ./build
 	mkdir -p ./build
 	${MAKE} ${MAKEOPTS} $(foreach function,${FUNCTIONS}, build-${function})

lambda-sqs-rust/README.md

@@ -12,6 +12,8 @@ Important: this application uses various AWS services and there are costs associ
 * [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html) installed and configured
 * [Git Installed](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 * [AWS Serverless Application Model](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html) (AWS SAM) installed
+* [Rust](https://www.rust-lang.org/) 1.56.0 or higher
+* [cargo-zigbuild](https://github.com/messense/cargo-zigbuild) and [Zig](https://ziglang.org/) for cross-compilation
 
 ## Deployment Instructions
 
@@ -23,7 +25,7 @@ Important: this application uses various AWS services and there are costs associ
     ```
     cd lambda-sqs-rust
     ```
-3. Install dependencies and build (docker and cross build are required):
+3. Install dependencies and build:
     ```
     make build
     ```

s3-eventbridge-direct-rust/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "sqs-lambda-rust"
+name = "s3-eventbridge-direct-rust"
 version = "0.1.0"
 edition = "2021"
 

s3-eventbridge-direct-rust/Makefile

@@ -1,8 +1,16 @@
 FUNCTIONS := handler
 ARCH := aarch64-unknown-linux-gnu
+ARCH_SPLIT = $(subst -, ,$(ARCH))
 
 build:
-	cross build --release --target $(ARCH)
+ifeq ("$(shell zig targets | jq -r .native.cpu.arch)-$(shell zig targets | jq -r .native.os)-$(shell zig targets | jq -r .native.abi)", "$(word 1,$(ARCH_SPLIT))-$(word 3,$(ARCH_SPLIT))-$(word 4,$(ARCH_SPLIT))")
+	@echo "Same host and target. Using native build"
+	cargo build --release --target $(ARCH)
+else
+	@echo "Different host and target. Using zigbuild"
+	cargo zigbuild --release --target $(ARCH)
+endif
+
 	rm -rf ./build
 	mkdir -p ./build
 	${MAKE} ${MAKEOPTS} $(foreach function,${FUNCTIONS}, build-${function})