[ci] Try to fix jammy clang build

ossia · Jul 17, 2022 · 03ba940 · 03ba940
1 parent b2ddc7a
commit 03ba940
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ubuntu-builds.yaml b/.github/workflows/ubuntu-builds.yaml
@@ -132,7 +132,7 @@ jobs:
 
       - name: Build
         run: |
-          CC=gcc-12 CXX=g++-12 ./ci/jammy.build.sh
+          CC=gcc-12 CXX=g++-12 LDFLAGS= ./ci/jammy.build.sh
 
       - name: Deploy
         run: |
@@ -168,4 +168,4 @@ jobs:
 
       - name: Build
         run: |
-          CC=clang-14 CXX=clang++-14 ./ci/jammy.build.sh
+          CC=clang-14 CXX=clang++-14 LDFLAGS=-fuse-ld=lld ./ci/jammy.build.sh
diff --git a/ci/jammy.build.sh b/ci/jammy.build.sh
@@ -10,7 +10,10 @@ cmake .. \
   -DBUILD_SHARED_LIBS=0 \
   -DCMAKE_BUILD_TYPE=Release \
   -DCMAKE_INSTALL_PREFIX=install \
-  -DCMAKE_UNITY_BUILD=1
+  -DCMAKE_UNITY_BUILD=1 \
+  -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" \
+  -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS" \
+  -DCMAKE_MODULE_LINKER_FLAGS="$LDFLAGS"
 
 cmake --build .
 cmake --build . --target install

diff --git a/ci/jammy.deps.sh b/ci/jammy.deps.sh
@@ -8,7 +8,7 @@ apt-get install -y \
     --allow-downgrades \
     --allow-remove-essential \
     --allow-unauthenticated \
-     binutils gcc-12 g++-12 clang-14 clang++-14 \
+     binutils gcc-12 g++-12 clang-14 clang++-14 lld-14 \
      software-properties-common wget \
      libasound-dev \
      ninja-build cmake \