azalea/hyfetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[F] Fix osx build strip issue

Browse Source
This commit is contained in:
Azalea Gui
2024-12-22 05:53:46 -05:00
parent 8e4b57e33a
commit b009342d78
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/rust-builder/osx/Dockerfile
+2
View File
@@ -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 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
# Add toolchains for building for macOS[x86_64, aarch64] # 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 RUN /root/.cargo/bin/rustup target add x86_64-apple-darwin aarch64-apple-darwin
# Copy osxcross toolchain # Copy osxcross toolchain
tools/rust-builder/osx/build.sh
+3 -5
View File
@@ -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_LINKER=/osxcross/bin/aarch64-apple-darwin$OSX_VER-clang
export CARGO_TARGET_AARCH64_APPLE_DARWIN_AR=/osxcross/bin/aarch64-apple-darwin$OSX_VER-ar export CARGO_TARGET_AARCH64_APPLE_DARWIN_AR=/osxcross/bin/aarch64-apple-darwin$OSX_VER-ar
# Build for platforms # Build for platforms
#cp /osxcross/bin/x86_64-apple-darwin$OSX_VER-strip /usr/bin/strip # +beta because rust doesn't know which strip to use until version 1.84
cargo build --release --target x86_64-apple-darwin cargo +beta build --release --target x86_64-apple-darwin
#cp /osxcross/bin/aarch64-apple-darwin$OSX_VER-strip /usr/bin/strip cargo +beta build --release --target aarch64-apple-darwin
cargo build --release --target aarch64-apple-darwin