diff --git a/build.sh b/build.sh index 45ed63c..c9b0df7 100755 --- a/build.sh +++ b/build.sh @@ -44,7 +44,7 @@ build() { cd out cp -af ../rust/build/$TRIPLE/llvm/bin llvm-bin cp -af ../rust/build/$TRIPLE/llvm/lib/clang/$RUST_CLANG/include clang-include - ln -s ../lib/rustlib/$TRIPLE/bin/rust-lld llvm-bin/lld + cp -af lib/rustlib/$TRIPLE/bin/rust-lld llvm-bin/lld ln -s lld llvm-bin/ld find ../rust/build/$TRIPLE/llvm/lib -name "*.${DYN_EXT}*" -exec cp -an {} lib \; cd .. @@ -93,12 +93,6 @@ universal() { cp -af out.x86 out cp -an out.arm/. out/. || true - # Replace lld link with universal binary - rm out/llvm-bin/lld - lipo -create -output out/llvm-bin/lld \ - out/lib/rustlib/x86_64-apple-darwin/bin/rust-lld \ - out/lib/rustlib/aarch64-apple-darwin/bin/rust-lld - # Merge all Mach-O files as universal binary and adhoc codesign find out -type f -exec sh -c "file {} | grep -q Mach-O" \; -print0 | \ while IFS= read -r -d '' o; do diff --git a/common.sh b/common.sh index 0a53dc5..9c198cb 100644 --- a/common.sh +++ b/common.sh @@ -3,7 +3,7 @@ RUST_VERSION='beta' NDK_VERSION='r24' -OUTPUT_VERSION='r24.0' +OUTPUT_VERSION='r24.1' RUST_CLANG='14.0.0' NDK_CLANG='14.0.1'