mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 08:37:14 +00:00
Enable building Cargo for aarch64-apple-darwin
This commit is contained in:
parent
d909d69d3a
commit
5ae5b0e790
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
|
@ -306,7 +306,7 @@ jobs:
|
|||
- name: dist-aarch64-apple
|
||||
env:
|
||||
SCRIPT: "./x.py dist --stage 2"
|
||||
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --tools=rls,clippy,rustfmt,analysis,src"
|
||||
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
|
||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||
SELECT_XCODE: /Applications/Xcode_12_beta.app
|
||||
USE_XCODE_CLANG: 1
|
||||
|
@ -314,6 +314,7 @@ jobs:
|
|||
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
|
||||
NO_LLVM_ASSERTIONS: 1
|
||||
NO_DEBUG_ASSERTIONS: 1
|
||||
DIST_REQUIRE_ALL_TOOLS: 1
|
||||
os: macos-latest
|
||||
- name: x86_64-msvc-1
|
||||
env:
|
||||
|
|
|
@ -469,11 +469,11 @@ jobs:
|
|||
--build=x86_64-apple-darwin
|
||||
--host=aarch64-apple-darwin
|
||||
--target=aarch64-apple-darwin
|
||||
--enable-full-tools
|
||||
--enable-sanitizers
|
||||
--enable-profiler
|
||||
--set rust.jemalloc
|
||||
--set llvm.ninja=false
|
||||
--tools=rls,clippy,rustfmt,analysis,src
|
||||
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
|
||||
SELECT_XCODE: /Applications/Xcode_12_beta.app
|
||||
USE_XCODE_CLANG: 1
|
||||
|
@ -481,12 +481,7 @@ jobs:
|
|||
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
|
||||
NO_LLVM_ASSERTIONS: 1
|
||||
NO_DEBUG_ASSERTIONS: 1
|
||||
# TODO: Cargo is disabled until OpenSSL 1.1.1 can be
|
||||
# compiled for aarch64-apple-darwin::
|
||||
# https://github.com/openssl/openssl/pull/12369. Once
|
||||
# fixed, remove `--tools`, add back
|
||||
# `--enable-full-tools`, and enable this again
|
||||
# DIST_REQUIRE_ALL_TOOLS: 1
|
||||
DIST_REQUIRE_ALL_TOOLS: 1
|
||||
<<: *job-macos-xl
|
||||
|
||||
######################
|
||||
|
|
Loading…
Reference in a new issue