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

Bugfix

Browse Source
This commit is contained in:
Andrea Cavalli 2021-09-14 02:03:14 +02:00
parent 26a3b75a8d
commit 479fa4dffc
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,8 @@ else
fi fi
echo "====== Setup variables ======" echo "====== Setup variables ======"
echo "Current root directory:" if [[ "$OPERATING_SYSTEM_NAME" != "osx" ]]; then
if [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then echo "Current root directory:"
else
realpath . realpath .
fi fi
echo "=============================" echo "============================="

16
scripts/core/setup-variables.sh
View File

@ -1,16 +1,10 @@
#!/bin/bash -e #!/bin/bash -e
safe_realpath() {
if [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
grealpath "$1"
else
realpath "$1"
fi
}
echo "====== Setup variables ======" echo "====== Setup variables ======"
echo "Current root directory:" if [[ "$OPERATING_SYSTEM_NAME" != "osx" ]]; then
safe_realpath "." echo "Current root directory:"
realpath "."
fi
echo "=============================" echo "============================="
# ====== CPU Architecture Variables # ====== CPU Architecture Variables
@ -78,7 +72,7 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
export CROSS_CC="${CPU_ARCH_CMAKE}-linux-gnu-gcc" export CROSS_CC="${CPU_ARCH_CMAKE}-linux-gnu-gcc"
export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-gnu-g++" export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-gnu-g++"
CROSS_BUILD_DEPS_DIR="$(safe_realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}/" CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}/"
fi fi
# ====== Print variables # ====== Print variables