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

Fix linking -latomic on 32 bit operating systems

Browse Source
This commit is contained in:
Andrea Cavalli 2021-03-16 11:32:15 +01:00
parent a02e5dbba8
commit 1541968c58
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/platform_natives.yaml vendored
View File

@ -12,8 +12,8 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlight" } - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlib" } - {os: ubuntu-20.04, usedocker: "true", arch: "linux/386", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"} - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlight"}
- {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"} - {os: ubuntu-20.04, usedocker: "false", arch: "linux/amd64", implementation: "tdlib"}
- {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlight"} - {os: ubuntu-20.04, usedocker: "true", arch: "linux/arm/v6", implementation: "tdlight"}

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

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