From dda779bfac639949843bd02b2ec7d619504adb28 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 16 Mar 2021 13:09:45 +0100 Subject: [PATCH] Always use clang --- .../github-workflows/install-dependencies.sh | 9 +++------ .../github-workflows/setup-variables.sh | 10 +++------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/scripts/continuous-integration/github-workflows/install-dependencies.sh b/scripts/continuous-integration/github-workflows/install-dependencies.sh index 584d302..037c4bb 100755 --- a/scripts/continuous-integration/github-workflows/install-dependencies.sh +++ b/scripts/continuous-integration/github-workflows/install-dependencies.sh @@ -4,12 +4,9 @@ set -e if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then echo "==Linux====" sudo apt install -y make git zlib1g-dev libssl-dev gperf cmake \ - ccache maven python3 python3-pip php7.4-cli - if { [[ "$IMPLEMENTATION_NAME" == "tdlib" ]]; } && { [[ "$CPU_ARCHITECTURE_NAME" == "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv6" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv7" ]]; }; then - sudo apt install -y build-essential - else - sudo apt install -y clang-11 libc++-11-dev libc++abi-11-dev - fi + ccache maven python3 python3-pip php7.4-cli \ + clang-11 libc++-11-dev libc++abi-11-dev + elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then echo "==OSX======" export PYTHON=36 diff --git a/scripts/continuous-integration/github-workflows/setup-variables.sh b/scripts/continuous-integration/github-workflows/setup-variables.sh index 423b657..950c1f0 100644 --- a/scripts/continuous-integration/github-workflows/setup-variables.sh +++ b/scripts/continuous-integration/github-workflows/setup-variables.sh @@ -92,13 +92,9 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then export CXXFLAGS="$CXXFLAGS -latomic" fi - if { [[ "$IMPLEMENTATION_NAME" == "tdlib" ]]; } && { [[ "$CPU_ARCHITECTURE_NAME" == "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv6" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv7" ]]; }; then - export CXXFLAGS="$CXXFLAGS" - else - export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" - export CC="/usr/bin/clang-11" - export CXX="/usr/bin/clang++-11" - fi + export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++" + export CC="/usr/bin/clang-11" + export CXX="/usr/bin/clang++-11" export CPU_CORES=" -- -j${CPU_CORES_NUM}" fi