This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
The following commit(s) were added to refs/heads/main by this push:
new 09e8981d [chore] fix mac use gcc bug (#83)
09e8981d is described below
commit 09e8981d54e7e11f37a17d4687313a326d245597
Author: Mingyu Chen <[email protected]>
AuthorDate: Mon May 29 23:25:07 2023 +0800
[chore] fix mac use gcc bug (#83)
on MacOS, should use clang instead of gcc
---
.github/workflows/build-1.2.yml | 3 ++-
.github/workflows/build.yml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-1.2.yml b/.github/workflows/build-1.2.yml
index 34595861..df403fb5 100644
--- a/.github/workflows/build-1.2.yml
+++ b/.github/workflows/build-1.2.yml
@@ -198,10 +198,11 @@ jobs:
export PATH="${DEFAULT_DIR}/ldb-toolchain/bin:${PATH}"
export PATH="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 1 -type
d -name 'bin'):${PATH}"
export JAVA_HOME="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 0)"
+ export DORIS_TOOLCHAIN=gcc
fi
cd thirdparty
- DORIS_TOOLCHAIN=gcc ./build-thirdparty.sh -j "$(nproc)"
+ ./build-thirdparty.sh -j "$(nproc)"
kernel="$(uname -s | awk '{print tolower($0)}')"
arch="$(uname -m)"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2cfd1ca..e4e7d415 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -186,10 +186,11 @@ jobs:
export PATH="${DEFAULT_DIR}/ldb-toolchain/bin:${PATH}"
export PATH="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 1 -type
d -name 'bin'):${PATH}"
export JAVA_HOME="$(find /usr/lib/jvm/java-8-openjdk* -maxdepth 0)"
+ export DORIS_TOOLCHAIN=gcc
fi
cd thirdparty
- DORIS_TOOLCHAIN=gcc ./build-thirdparty.sh -j "$(nproc)"
+ ./build-thirdparty.sh -j "$(nproc)"
kernel="$(uname -s | awk '{print tolower($0)}')"
arch="$(uname -m)"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
