Skip to content

Commit 3936cb3

Browse files
committed
Move cargo to local config to avoid cp
1 parent 28645d7 commit 3936cb3

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed
File renamed without changes.

.github/workflows/release.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
run: |
3030
brew install rustup
3131
rustup-init -y --default-toolchain ${VERSION}
32-
cp cargo.toml $HOME/.cargo/config.toml
3332
source $HOME/.cargo/env
3433
3534
- name: Install Android NDK
@@ -64,11 +63,10 @@ jobs:
6463
RUSTC_BOOTSTRAP: 1
6564
# This is required by compiler-builtins
6665
RUSTC_SRC: ${{ steps.rust-src.outputs.path }}
67-
RUSTFLAGS: "-C panic=abort -C opt-level=s -C llvm-args=--inline-threshold=225 -C codegen-units=1 -Zlocation-detail=none"
66+
RUSTFLAGS: "-C panic=abort -C opt-level=s -C llvm-args=--inline-threshold=225 -C codegen-units=1 -Zlocation-detail=none -Zforce-unstable-if-unmarked"
6867
IPHONEOS_DEPLOYMENT_TARGET: "14.0"
6968
run: |
7069
cd ${RUSTC_SRC}/library/std
71-
export RUSTFLAGS="-Zforce-unstable-if-unmarked"
7270
cargo build \
7371
--release \
7472
--features "panic_immediate_abort,optimize_for_size" \
@@ -80,12 +78,11 @@ jobs:
8078
env:
8179
RUSTC_BOOTSTRAP: 1
8280
RUSTC_SRC: ${{ steps.rust-src.outputs.path }}
83-
RUSTFLAGS: "-C panic=abort -C opt-level=s -C llvm-args=--inline-threshold=225 -C codegen-units=1 -Zlocation-detail=none"
81+
RUSTFLAGS: "-C panic=abort -C opt-level=s -C llvm-args=--inline-threshold=225 -C codegen-units=1 -Zlocation-detail=none -Zforce-unstable-if-unmarked"
8482
run: |
8583
cd ${RUSTC_SRC}/library/std
8684
# Set the path pointing to the NDK where all the cross-compiling clang binaries exist
8785
export PATH="${ANDROID_NDK_BIN_PATH}:${PATH}"
88-
export RUSTFLAGS="-Zforce-unstable-if-unmarked"
8986
cargo build \
9087
--release \
9188
--features "panic_immediate_abort,optimize_for_size" \

0 commit comments

Comments
 (0)