From 48f52be2d36ee8a7a1c1676abd010ce633b9f729 Mon Sep 17 00:00:00 2001 From: Azalea Gui <22280294+hykilpikonna@users.noreply.github.com> Date: Sun, 22 Dec 2024 05:55:38 -0500 Subject: [PATCH] [F] Fix windows build --- tools/build_rust.sh | 2 +- tools/rust-builder/general/build.sh | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/build_rust.sh b/tools/build_rust.sh index 3068c1aa..abf0041d 100755 --- a/tools/build_rust.sh +++ b/tools/build_rust.sh @@ -2,7 +2,7 @@ set -e -#echo "Building the Docker image..." +echo "Building the Docker image..." docker build -t rust-builder-general tools/rust-builder/general echo "Running the Docker container..." diff --git a/tools/rust-builder/general/build.sh b/tools/rust-builder/general/build.sh index a40de4ed..3f6cfd05 100755 --- a/tools/rust-builder/general/build.sh +++ b/tools/rust-builder/general/build.sh @@ -12,12 +12,8 @@ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/musl/aarch64/bin/musl-gcc export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER=/musl/armv7l/bin/musl-gcc export CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_MUSL_LINKER=/musl/riscv64/bin/musl-gcc -# OSX linker and ar -#export OSX_VER=20.4 -#export CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER=/osxcross/bin/x86_64-apple-darwin$OSX_VER-clang -#export CARGO_TARGET_X86_64_APPLE_DARWIN_AR=/osxcross/bin/x86_64-apple-darwin$OSX_VER-ar -#export CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER=/osxcross/bin/aarch64-apple-darwin$OSX_VER-clang -#export CARGO_TARGET_AARCH64_APPLE_DARWIN_AR=/osxcross/bin/aarch64-apple-darwin$OSX_VER-ar +# Build for windows +cargo build --release --target x86_64-pc-windows-gnu # Add -C relocation-model=static to the build command # See https://github.com/rust-lang/rust/issues/95926 @@ -28,6 +24,3 @@ cargo build --release --target x86_64-unknown-linux-musl cargo build --release --target aarch64-unknown-linux-musl cargo build --release --target armv7-unknown-linux-musleabihf #cargo build --release --target riscv64gc-unknown-linux-musl -cargo build --release --target x86_64-pc-windows-gnu -#cargo build --release --target x86_64-apple-darwin -#cargo build --release --target aarch64-apple-darwin