diff options
| author | Jake Goulding <jake.goulding@gmail.com> | 2020-09-26 09:42:04 -0400 |
|---|---|---|
| committer | Jake Goulding <jake.goulding@gmail.com> | 2020-10-12 13:58:03 -0400 |
| commit | 5ae5b0e79035a2f858a22536156e1f9eb4b59cad (patch) | |
| tree | 742278d8e32f341374766feef8990d7fb019dafc /src/ci/github-actions | |
| parent | d909d69d3a1d222587b9ffe27b73f5afab44ed54 (diff) | |
| download | rust-5ae5b0e79035a2f858a22536156e1f9eb4b59cad.tar.gz rust-5ae5b0e79035a2f858a22536156e1f9eb4b59cad.zip | |
Enable building Cargo for aarch64-apple-darwin
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 7346330bfb7..2ce0093079c 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -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 ###################### |