From 0cad5f9e8a759735f66c2e9710960547d50c328d Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 14 May 2023 01:19:06 +0200 Subject: [PATCH] Update clang --- .github/workflows/platform_natives.yaml | 8 ++++---- .../scripts/install_deps_linux_386_ssl3.sh | 6 +++--- .../scripts/install_deps_linux_armhf_ssl3.sh | 10 +++++----- .../install_deps_linux_ppc64le_ssl3.sh | 6 +++--- .../install_deps_linux_riscv64_ssl3.sh | 6 +++--- .github/workflows/tdapi_file.yaml.off | 2 +- .../toolchains/toolchain_arm64.cmake | 20 +++++++++---------- .../toolchains/toolchain_armhf.cmake | 20 +++++++++---------- .../workflows/toolchains/toolchain_i386.cmake | 20 +++++++++---------- .../toolchains/toolchain_ppc64le.cmake | 20 +++++++++---------- .../toolchains/toolchain_riscv64.cmake | 20 +++++++++---------- 11 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 416f196..9e3e3cc 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -116,12 +116,12 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive sudo apt-get --assume-yes update - sudo apt-get --assume-yes install make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev libgcc-9-dev libunwind-dev libclang-common-10-dev ccache maven + sudo apt-get --assume-yes install make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-12 lld-12 libc++-12-dev libc++abi-12-dev libgcc-9-dev libunwind-dev libclang-common-12-dev ccache maven # - name: Install ubuntu 20.04 dependencies (cached) # if: matrix.os == 'ubuntu-20.04' # uses: awalsh128/cache-apt-pkgs-action@latest # with: -# packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-10 lld-10 libc++-10-dev libc++abi-10-dev libgcc-9-dev libunwind-dev libclang-common-10-dev ccache maven +# packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-12 lld-12 libc++-12-dev libc++abi-12-dev libgcc-9-dev libunwind-dev libclang-common-12-dev ccache maven # version: 1.0 - name: Install ubuntu 22.04 dependencies if: matrix.os == 'ubuntu-22.04' @@ -129,12 +129,12 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive sudo apt-get --assume-yes update - sudo apt-get --assume-yes install make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-15 lld-15 libc++-15-dev libc++abi-15-dev libgcc-11-dev libunwind-15-dev libclang-common-15-dev ccache maven + sudo apt-get --assume-yes install make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven # - name: Install ubuntu 22.04 dependencies (cached) # if: matrix.os == 'ubuntu-22.04' # uses: awalsh128/cache-apt-pkgs-action@latest # with: -# packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-15 lld-15 libc++-15-dev libc++abi-15-dev libgcc-11-dev libunwind-15-dev libclang-common-15-dev ccache maven +# packages: make git zlib1g-dev libssl-dev gperf php-cli cmake default-jdk clang-14 lld-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven # version: 1.0 - name: Install custom dependencies shell: bash diff --git a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh index dc7bfb4..44a6e36 100755 --- a/.github/workflows/scripts/install_deps_linux_386_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_386_ssl3.sh @@ -14,12 +14,12 @@ apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-de cp --remove-destination \ /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ /usr/lib/aarch64-linux-gnu/ || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-15-dev libunwind-15 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add i386 common files -apt-get download libclang-common-15-dev:i386 -dpkg-deb -xv libclang-common-15-dev_*_i386.deb / +apt-get download libclang-common-14-dev:i386 +dpkg-deb -xv libclang-common-14-dev_*_i386.deb / # Install dependencies diff --git a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh index 6601afb..8abc21b 100755 --- a/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_armhf_ssl3.sh @@ -14,16 +14,16 @@ apt-get --assume-yes update # Install and bypass a bug in the cross-platform libc++ packages apt-get --assume-yes autoremove "libc++-14-dev:*" "libc++abi-14-dev:*" "libc++1-14:*" "libc++abi1-14:*" "libunwind-14-dev:*" "libunwind-14:*" || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:armhf libc++abi-14-dev:armhf libc++1-14:armhf libc++abi1-15:armhf libunwind-15-dev:armhf libunwind-15:armhf +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-dev:armhf libc++abi-14-dev:armhf libc++1-14:armhf libc++abi1-14:armhf libunwind-14-dev:armhf libunwind-14:armhf cp --remove-destination \ - /usr/lib/llvm-15/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ + /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ /usr/lib/aarch64-linux-gnu/ || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-15 libc++-15-dev libc++abi-15-dev libc++1-15 libc++abi1-15 libunwind-15-dev libunwind-15 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add armhf common files -apt-get download libclang-common-15-dev:armhf -dpkg-deb -xv libclang-common-15-dev_*_armhf.deb / +apt-get download libclang-common-14-dev:armhf +dpkg-deb -xv libclang-common-14-dev_*_armhf.deb / # Install dependencies diff --git a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh index ff6bf12..cbee242 100755 --- a/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_ppc64le_ssl3.sh @@ -18,12 +18,12 @@ apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-de cp --remove-destination \ /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ /usr/lib/aarch64-linux-gnu/ || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-15 libunwind-15-dev libunwind-15 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add ppc64le common files -apt-get download libclang-common-15-dev:ppc64el -dpkg-deb -xv libclang-common-15-dev_*_ppc64el.deb / +apt-get download libclang-common-14-dev:ppc64el +dpkg-deb -xv libclang-common-14-dev_*_ppc64el.deb / # Install dependencies diff --git a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh index 84ef3f6..21942fe 100755 --- a/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh +++ b/.github/workflows/scripts/install_deps_linux_riscv64_ssl3.sh @@ -18,12 +18,12 @@ apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install libc++-14-de cp --remove-destination \ /usr/lib/llvm-14/lib/{libc++abi.so,libc++abi.so.1.0,libc++.so,libc++.so.1.0,libunwind.so.1.0} \ /usr/lib/aarch64-linux-gnu/ || true -apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-15-dev libunwind-15 +apt-get --assume-yes -o Dpkg::Options::="--force-overwrite" install clang-14 libc++-14-dev libc++abi-14-dev libc++1-14 libc++abi1-14 libunwind-14-dev libunwind-14 # End libc++ packages bugfix # Add riscv64 common files -apt-get download libclang-common-15-dev:riscv64 -dpkg-deb -xv libclang-common-15-dev_*_riscv64.deb / +apt-get download libclang-common-14-dev:riscv64 +dpkg-deb -xv libclang-common-14-dev_*_riscv64.deb / # Install dependencies diff --git a/.github/workflows/tdapi_file.yaml.off b/.github/workflows/tdapi_file.yaml.off index d0ac051..fe4b0e0 100644 --- a/.github/workflows/tdapi_file.yaml.off +++ b/.github/workflows/tdapi_file.yaml.off @@ -18,7 +18,7 @@ jobs: if: matrix.os == 'ubuntu-22.04' uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake openjdk-17-jdk clang-15 libc++-15-dev libc++abi-15-dev libgcc-11-dev libunwind-15-dev libclang-common-15-dev ccache maven + packages: sudo make git zlib1g-dev libssl-dev gperf php-cli cmake openjdk-17-jdk clang-14 libc++-14-dev libc++abi-14-dev libgcc-11-dev libunwind-14-dev libclang-common-14-dev ccache maven version: 1.0 - name: Install SSH key uses: shimataro/ssh-key-action@v2 diff --git a/.github/workflows/toolchains/toolchain_arm64.cmake b/.github/workflows/toolchains/toolchain_arm64.cmake index 13d1b48..17e99a2 100644 --- a/.github/workflows/toolchains/toolchain_arm64.cmake +++ b/.github/workflows/toolchains/toolchain_arm64.cmake @@ -3,16 +3,16 @@ SET(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR aarch64) set(TARGET_TRIPLE aarch64-linux-gnu) -if(EXISTS "/usr/bin/clang-10") - set(CMAKE_C_COMPILER /usr/bin/clang-10) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-10) - set(CMAKE_ASM_COMPILER /usr/bin/clang-10) - set(CMAKE_AR "/usr/bin/llvm-ar-10" CACHE FILEPATH "" FORCE) -elseif(EXISTS "/usr/bin/clang-15") - set(CMAKE_C_COMPILER /usr/bin/clang-15) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-15) - set(CMAKE_ASM_COMPILER /usr/bin/clang-15) - set(CMAKE_AR "/usr/bin/llvm-ar-15" CACHE FILEPATH "" FORCE) +if(EXISTS "/usr/bin/clang-12") + set(CMAKE_C_COMPILER /usr/bin/clang-12) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + set(CMAKE_ASM_COMPILER /usr/bin/clang-12) + set(CMAKE_AR "/usr/bin/llvm-ar-12" CACHE FILEPATH "" FORCE) +elseif(EXISTS "/usr/bin/clang-14") + set(CMAKE_C_COMPILER /usr/bin/clang-14) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) + set(CMAKE_ASM_COMPILER /usr/bin/clang-14) + set(CMAKE_AR "/usr/bin/llvm-ar-14" CACHE FILEPATH "" FORCE) else() set(CMAKE_C_COMPILER /usr/bin/clang) set(CMAKE_CXX_COMPILER /usr/bin/clang++) diff --git a/.github/workflows/toolchains/toolchain_armhf.cmake b/.github/workflows/toolchains/toolchain_armhf.cmake index 5c4a5c0..59e4e25 100644 --- a/.github/workflows/toolchains/toolchain_armhf.cmake +++ b/.github/workflows/toolchains/toolchain_armhf.cmake @@ -3,16 +3,16 @@ SET(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) set(TARGET_TRIPLE arm-linux-gnueabihf) -if(EXISTS "/usr/bin/clang-10") - set(CMAKE_C_COMPILER /usr/bin/clang-10) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-10) - set(CMAKE_ASM_COMPILER /usr/bin/clang-10) - set(CMAKE_AR "/usr/bin/llvm-ar-10" CACHE FILEPATH "" FORCE) -elseif(EXISTS "/usr/bin/clang-15") - set(CMAKE_C_COMPILER /usr/bin/clang-15) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-15) - set(CMAKE_ASM_COMPILER /usr/bin/clang-15) - set(CMAKE_AR "/usr/bin/llvm-ar-15" CACHE FILEPATH "" FORCE) +if(EXISTS "/usr/bin/clang-12") + set(CMAKE_C_COMPILER /usr/bin/clang-12) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + set(CMAKE_ASM_COMPILER /usr/bin/clang-12) + set(CMAKE_AR "/usr/bin/llvm-ar-12" CACHE FILEPATH "" FORCE) +elseif(EXISTS "/usr/bin/clang-14") + set(CMAKE_C_COMPILER /usr/bin/clang-14) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) + set(CMAKE_ASM_COMPILER /usr/bin/clang-14) + set(CMAKE_AR "/usr/bin/llvm-ar-14" CACHE FILEPATH "" FORCE) else() set(CMAKE_C_COMPILER /usr/bin/clang) set(CMAKE_CXX_COMPILER /usr/bin/clang++) diff --git a/.github/workflows/toolchains/toolchain_i386.cmake b/.github/workflows/toolchains/toolchain_i386.cmake index 99fe9c7..c6d1337 100644 --- a/.github/workflows/toolchains/toolchain_i386.cmake +++ b/.github/workflows/toolchains/toolchain_i386.cmake @@ -3,16 +3,16 @@ SET(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR i386) set(TARGET_TRIPLE i386-linux-gnu) -if(EXISTS "/usr/bin/clang-10") - set(CMAKE_C_COMPILER /usr/bin/clang-10) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-10) - set(CMAKE_ASM_COMPILER /usr/bin/clang-10) - set(CMAKE_AR "/usr/bin/llvm-ar-10" CACHE FILEPATH "" FORCE) -elseif(EXISTS "/usr/bin/clang-15") - set(CMAKE_C_COMPILER /usr/bin/clang-15) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-15) - set(CMAKE_ASM_COMPILER /usr/bin/clang-15) - set(CMAKE_AR "/usr/bin/llvm-ar-15" CACHE FILEPATH "" FORCE) +if(EXISTS "/usr/bin/clang-12") + set(CMAKE_C_COMPILER /usr/bin/clang-12) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + set(CMAKE_ASM_COMPILER /usr/bin/clang-12) + set(CMAKE_AR "/usr/bin/llvm-ar-12" CACHE FILEPATH "" FORCE) +elseif(EXISTS "/usr/bin/clang-14") + set(CMAKE_C_COMPILER /usr/bin/clang-14) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) + set(CMAKE_ASM_COMPILER /usr/bin/clang-14) + set(CMAKE_AR "/usr/bin/llvm-ar-14" CACHE FILEPATH "" FORCE) else() set(CMAKE_C_COMPILER /usr/bin/clang) set(CMAKE_CXX_COMPILER /usr/bin/clang++) diff --git a/.github/workflows/toolchains/toolchain_ppc64le.cmake b/.github/workflows/toolchains/toolchain_ppc64le.cmake index 99b364c..765d5a0 100644 --- a/.github/workflows/toolchains/toolchain_ppc64le.cmake +++ b/.github/workflows/toolchains/toolchain_ppc64le.cmake @@ -3,16 +3,16 @@ SET(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR powerpc64le) set(TARGET_TRIPLE powerpc64le-linux-gnu) -if(EXISTS "/usr/bin/clang-10") - set(CMAKE_C_COMPILER /usr/bin/clang-10) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-10) - set(CMAKE_ASM_COMPILER /usr/bin/clang-10) - set(CMAKE_AR "/usr/bin/llvm-ar-10" CACHE FILEPATH "" FORCE) -elseif(EXISTS "/usr/bin/clang-15") - set(CMAKE_C_COMPILER /usr/bin/clang-15) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-15) - set(CMAKE_ASM_COMPILER /usr/bin/clang-15) - set(CMAKE_AR "/usr/bin/llvm-ar-15" CACHE FILEPATH "" FORCE) +if(EXISTS "/usr/bin/clang-12") + set(CMAKE_C_COMPILER /usr/bin/clang-12) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + set(CMAKE_ASM_COMPILER /usr/bin/clang-12) + set(CMAKE_AR "/usr/bin/llvm-ar-12" CACHE FILEPATH "" FORCE) +elseif(EXISTS "/usr/bin/clang-14") + set(CMAKE_C_COMPILER /usr/bin/clang-14) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) + set(CMAKE_ASM_COMPILER /usr/bin/clang-14) + set(CMAKE_AR "/usr/bin/llvm-ar-14" CACHE FILEPATH "" FORCE) else() set(CMAKE_C_COMPILER /usr/bin/clang) set(CMAKE_CXX_COMPILER /usr/bin/clang++) diff --git a/.github/workflows/toolchains/toolchain_riscv64.cmake b/.github/workflows/toolchains/toolchain_riscv64.cmake index 3e1f188..b7c1f30 100644 --- a/.github/workflows/toolchains/toolchain_riscv64.cmake +++ b/.github/workflows/toolchains/toolchain_riscv64.cmake @@ -3,16 +3,16 @@ SET(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR riscv64) set(TARGET_TRIPLE riscv64-linux-gnu) -if(EXISTS "/usr/bin/clang-10") - set(CMAKE_C_COMPILER /usr/bin/clang-10) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-10) - set(CMAKE_ASM_COMPILER /usr/bin/clang-10) - set(CMAKE_AR "/usr/bin/llvm-ar-10" CACHE FILEPATH "" FORCE) -elseif(EXISTS "/usr/bin/clang-15") - set(CMAKE_C_COMPILER /usr/bin/clang-15) - set(CMAKE_CXX_COMPILER /usr/bin/clang++-15) - set(CMAKE_ASM_COMPILER /usr/bin/clang-15) - set(CMAKE_AR "/usr/bin/llvm-ar-15" CACHE FILEPATH "" FORCE) +if(EXISTS "/usr/bin/clang-12") + set(CMAKE_C_COMPILER /usr/bin/clang-12) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + set(CMAKE_ASM_COMPILER /usr/bin/clang-12) + set(CMAKE_AR "/usr/bin/llvm-ar-12" CACHE FILEPATH "" FORCE) +elseif(EXISTS "/usr/bin/clang-14") + set(CMAKE_C_COMPILER /usr/bin/clang-14) + set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) + set(CMAKE_ASM_COMPILER /usr/bin/clang-14) + set(CMAKE_AR "/usr/bin/llvm-ar-14" CACHE FILEPATH "" FORCE) else() set(CMAKE_C_COMPILER /usr/bin/clang) set(CMAKE_CXX_COMPILER /usr/bin/clang++)