Fix clang (again)

rollbear · Jul 5, 2024 · 110ad76 · 110ad76
1 parent 3d3cda4
commit 110ad76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,8 +22,8 @@ jobs:
           - { clang_version: "3.9", libcxx: "", build_libcxx: "./install-libcxx.sh 3.9 3.9.1 &&  ", container: $UBUNTU_16_04, std: "11 14" }
           - { clang_version: "4.0", libcxx: "", build_libcxx: "./install-libcxx.sh 4.0 4.0.1 &&  ", container: $UBUNTU_18_04, std: "11 14" }
           - { clang_version: "5.0", libcxx: "", build_libcxx: "./install-libcxx.sh 5.0 5.0.2 &&  ", container: $UBUNTU_18_04, std: "11 14 17" }
-          - { clang_version: "6.0", libcxx: "", build_libcxx: "./install-libcxx.sh 6.0 6.0.1 &&  ", container: $UBUNTU_18_04, std: "11 14 17" }
-          - { clang_version: "7",   libcxx: "", build_libcxx: "./install-libcxx.sh 7 7.1.0 && ", container: $UBUNTU_18_04, std: "11 14 17" }
+          - { clang_version: "6.0", libcxx: "libc++-dev libc++abi-dev", build_libcxx: "", container: $UBUNTU_18_04, std: "11 14 17" }
+          - { clang_version: "7",   libcxx: "libc++-7-dev libc++abi-7-dev", build_libcxx: "", container: $UBUNTU_18_04, std: "11 14 17" }
           - { clang_version: "8",   libcxx: "", build_libcxx: "./install-libcxx.sh 8 8.0.1 && ", container: $UBUNTU_20_04, std: "11 14 17" }
           - { clang_version: "9",   libcxx: "", build_libcxx: "./install-libcxx.sh 9 9.0.1 && ", container: $UBUNTU_20_04, std: "11 14 17" }
           - { clang_version: "10",  libcxx: "", build_libcxx: "./install-libcxx.sh 10 10.0.1 && ", container: $UBUNTU_20_04, std: "11 14 17 20" }
@@ -34,7 +34,7 @@ jobs:
           - { clang_version: "15",  libcxx: "", build_libcxx: "./install-libcxx.sh 15 15.0.7 && ", container: $UBUNTU_22_04, std: "11 14 17 20" }
           - { clang_version: "16",  libcxx: "", build_libcxx: "", container: $UBUNTU_22_04, std: "11 14 17 20 23" }
           - { clang_version: "17",  libcxx: "", build_libcxx: "", container: $UBUNTU_22_04, std: "11 14 17 20 23" }
-          - { clang_version: "18",  libcxx: "", build_libcxx: "", container: $UBUNTU_24_04, std: "11 14 17 20 23" }
+          - { clang_version: "18",  libcxx: "libc++-18-dev libc++abi-18-dev", build_libcxx: "", container: $UBUNTU_24_04, std: "11 14 17 20 23" }
 
     runs-on: ubuntu-latest
     env:

diff --git a/clang/install-clang.sh b/clang/install-clang.sh
@@ -12,11 +12,9 @@ else
     FUZZER=""
 fi
 
-if [ $MAJOR -ge 18 ]
+if [ -z "$LIBCXX" -a $MAJOR -ge 18 ]
 then
   LIBCXX="libc++-${VERSION}-dev"
-else
-  LIBCXX=""
 fi
 
 fetch_clang () {

diff --git a/clang/install-libcxx.sh b/clang/install-libcxx.sh
@@ -5,7 +5,7 @@ set -e
 VERSION=$2
 
 MAJOR=$(echo $VERSION | sed 's/\..*//')
-
+apt install make
 echo "Fetching libc++/libc++abi version: ${VERSION}..."
 if [ ${MAJOR} -ge 8 ]; then
     BASE_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-"
@@ -79,7 +79,6 @@ else
           -DLIBCXX_NEEDS_SITE_CONFIG=no \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -B llvm-build \
-          -G Ninja \
           llvm-source
     cmake --build llvm-build --target cxxabi
     cmake --build llvm-build --target install-cxxabi