github-actions[bot] commented on code in PR #68595:
URL: https://github.com/apache/doris/pull/68595#discussion_r4131458582
##########
thirdparty/build-thirdparty.sh:
##########
@@ -87,6 +87,28 @@ unset CMAKE_TOOLCHAIN_FILE \
VCPKG_DEFAULT_TRIPLET \
CONDA_PREFIX
+# The macOS third-party libraries stay on LLVM 20 while env.sh gives the BE
LLVM 22 (the
+# first compiler-rt whose ASAN runtime survives macOS 26.4+). clang 22 turns
+# -Wincompatible-pointer-types into an error and stops at unixODBC 2.3.7
+# (SQLBrowseConnectW.c passes SQLSMALLINT* where int* is expected), and no
package after it
+# has been built with clang 22. Every macOS third-party build comes through
here - the
+# rebuild build.sh starts on its own, a manual run, the pull request check and
the
+# apache/doris-thirdparty job that publishes
doris-thirdparty-prebuilt-darwin-*.tar.xz - so
+# this is the one place that decides their compiler. Like the unset above, it
has to come
+# after env.sh: custom_env.sh may point DORIS_CLANG_HOME at another LLVM for
the BE. CC/CXX
+# carry the compiler and PATH the rest of the LLVM tools, as when env.sh named
llvm@20.
+if [[ "$(uname -s)" == 'Darwin' ]]; then
+ DORIS_CLANG_HOME="$(brew --prefix llvm@20)"
Review Comment:
[P1] Provision LLVM 20 for fresh macOS third-party builds
`build.sh` invokes this script when the installed third-party library
sentinel is absent, and also for a missing mecab directory. A fresh macOS setup
now selects only `llvm@22` in `env.sh`; the BE macOS workflow likewise installs
only `llvm@22`, while this unconditional check requires `llvm@20/bin/clang`
before any package can build. Installing LLVM 22 does not install LLVM 20, so
fresh source builds (and the workflow's fallback when an archive lacks either
artifact) stop here. Install both versions in those entry paths while keeping
the BE compiler on 22.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]