Skip to content

Commit 1072337

Browse files
committed
Auto merge of rust-lang#105845 - lqd:revert-thinlto-revert, r=Mark-Simulacrum
Re-enable ThinLTO for rustc on `x86_64-apple-darwin` ThinLTO was disabled on x64 mac in rust-lang#105646 because of the rust-lang#105637 regression. It was later discovered that the issue was present on other targets as well, as the mac revert was already landing. The linux/win reverts, however, did not land before the root cause was identified. rust-lang#105800 fixed the underlying issue in `-Zdylib-lto` handling, and the x64 msvc and linux targets are now fixed, ICEs are using the correct `rustc_driver` panic hook. This PR re-enables ThinLTO on mac for improved perf now that the issue should be fixed everywhere.
2 parents 224fa39 + ae68e17 commit 1072337

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ jobs:
301301
- name: dist-x86_64-apple
302302
env:
303303
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
304-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
304+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
305305
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
306306
MACOSX_DEPLOYMENT_TARGET: 10.7
307307
SELECT_XCODE: /Applications/Xcode_13.4.1.app

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ jobs:
467467
- name: dist-x86_64-apple
468468
env:
469469
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
470-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
470+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin
471471
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
472472
MACOSX_DEPLOYMENT_TARGET: 10.7
473473
SELECT_XCODE: /Applications/Xcode_13.4.1.app

0 commit comments

Comments
 (0)