Disable LTO for external libraries

james58899 · Mar 19, 2024 · 3245a2c · 3245a2c
1 parent 755b471
commit 3245a2c
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,10 +35,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install build tools
       run: |
-        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-        echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-        sudo apt-get update
-        sudo apt-get install -y crossbuild-essential-arm64 crossbuild-essential-armhf clang-17 lld-17
+        sudo apt-get update && sudo apt-get install -y crossbuild-essential-arm64 crossbuild-essential-armhf
     - uses: actions/cache@v4
       with:
         path: |
@@ -54,16 +51,10 @@ jobs:
         rustup target add ${{ matrix.target }}
     - name: Build
       env:
-        CC: clang-17
-        CXX: clang-17
-        CFLAGS: "-flto -fuse-ld=lld-17"
-        CXXFLAGS: "-flto -fuse-ld=lld-17"
-        __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS: "nightly"
-        CARGO_HOST_RUSTFLAGS: "-Clinker=clang-17 -Clink-arg=-fuse-ld=lld-17"
-        CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=clang-17 -Clink-arg=-fuse-ld=lld-17 -Clink-arg=--target=x86_64-unknown-linux-gnu"
-        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=clang-17 -Clink-arg=-fuse-ld=lld-17 -Clink-arg=--target=aarch64-unknown-linux-gnu"
-        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=clang-17 -Clink-arg=-fuse-ld=lld-17 -Clink-arg=--target=armv7-unknown-linux-gnueabihf"
-      run: cargo -Ztarget-applies-to-host -Zhost-config build --verbose --release --target=${{ matrix.target }}
+        CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=rust-lld"
+        CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=rust-lld"
+        CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS: "-Clinker-plugin-lto -Clinker=rust-lld"
+      run: cargo build --verbose --release --target=${{ matrix.target }}
     - uses: actions/upload-artifact@v4
       with:
         name: hath-rust-${{ matrix.target }}