tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Always use clang

Browse Source
This commit is contained in:
Andrea Cavalli 2021-03-16 13:09:45 +01:00
parent 11c80336d7
commit dda779bfac
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/continuous-integration/github-workflows/install-dependencies.sh
View File

@ -4,12 +4,9 @@ set -e
if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
echo "==Linux====" echo "==Linux===="
sudo apt install -y make git zlib1g-dev libssl-dev gperf cmake \ sudo apt install -y make git zlib1g-dev libssl-dev gperf cmake \
ccache maven python3 python3-pip php7.4-cli 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 clang-11 libc++-11-dev libc++abi-11-dev
sudo apt install -y build-essential
else
sudo apt install -y clang-11 libc++-11-dev libc++abi-11-dev
fi
elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
echo "==OSX======" echo "==OSX======"
export PYTHON=36 export PYTHON=36

10
scripts/continuous-integration/github-workflows/setup-variables.sh
View File

@ -92,13 +92,9 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
export CXXFLAGS="$CXXFLAGS -latomic" export CXXFLAGS="$CXXFLAGS -latomic"
fi fi
if { [[ "$IMPLEMENTATION_NAME" == "tdlib" ]]; } && { [[ "$CPU_ARCHITECTURE_NAME" == "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv6" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armv7" ]]; }; then export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++"
export CXXFLAGS="$CXXFLAGS" export CC="/usr/bin/clang-11"
else export CXX="/usr/bin/clang++-11"
export CXXFLAGS="$CXXFLAGS -static-libgcc -static-libstdc++"
export CC="/usr/bin/clang-11"
export CXX="/usr/bin/clang++-11"
fi
export CPU_CORES=" -- -j${CPU_CORES_NUM}" export CPU_CORES=" -- -j${CPU_CORES_NUM}"
fi fi