Skip to content

Commit 6ce9861

Browse files
committed
Correctly embed the bitcode when compiling the sysroot
1 parent 9b4f8b4 commit 6ce9861

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ jobs:
7575
- name: Run tests
7676
run: |
7777
# FIXME(antoyo): we cannot enable LTO for stdarch tests currently because of some failing LTO tests using proc-macros.
78-
# FIXME(antoyo): this should probably not be needed since we embed the LTO bitcode.
79-
printf '[profile.release]\nlto = "fat"\n' >> build/build_sysroot/sysroot_src/library/Cargo.toml
8078
./y.sh test --release --clean --release-sysroot --build-sysroot --keep-lto-tests ${{ matrix.commands }}
8179
8280
- name: LTO test

build_system/src/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Resu
108108
if config.sysroot_panic_abort {
109109
rustflags.push_str(" -Cpanic=abort -Zpanic-abort-tests");
110110
}
111+
rustflags.push_str(" -Cembed-bitcode=yes");
111112
rustflags.push_str(" -Z force-unstable-if-unmarked");
112113
if config.no_default_features {
113114
rustflags.push_str(" -Csymbol-mangling-version=v0");

0 commit comments

Comments
 (0)