diff --git a/tools/rust-builder/osx/Dockerfile b/tools/rust-builder/osx/Dockerfile index 125926de..ed954a11 100644 --- a/tools/rust-builder/osx/Dockerfile +++ b/tools/rust-builder/osx/Dockerfile @@ -7,6 +7,8 @@ RUN apk add --no-cache curl gcc musl-dev openssl-dev bash clang lld RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # Add toolchains for building for macOS[x86_64, aarch64] +RUN /root/.cargo/bin/rustup toolchain install beta && \ + /root/.cargo/bin/rustup default beta RUN /root/.cargo/bin/rustup target add x86_64-apple-darwin aarch64-apple-darwin # Copy osxcross toolchain diff --git a/tools/rust-builder/osx/build.sh b/tools/rust-builder/osx/build.sh index 72beb08b..55eea68f 100755 --- a/tools/rust-builder/osx/build.sh +++ b/tools/rust-builder/osx/build.sh @@ -13,9 +13,7 @@ export CARGO_TARGET_X86_64_APPLE_DARWIN_AR=/osxcross/bin/x86_64-apple-darwin$OSX 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 platforms -#cp /osxcross/bin/x86_64-apple-darwin$OSX_VER-strip /usr/bin/strip -cargo build --release --target x86_64-apple-darwin -#cp /osxcross/bin/aarch64-apple-darwin$OSX_VER-strip /usr/bin/strip -cargo build --release --target aarch64-apple-darwin +# +beta because rust doesn't know which strip to use until version 1.84 +cargo +beta build --release --target x86_64-apple-darwin +cargo +beta build --release --target aarch64-apple-darwin