[zorg] Replace obsolete LLVM_CONFIG_PATH

[mgorny]

Summary

Replace the obsolete LLVM_CONFIG_PATH uses with LLVM_CMAKE_DIR in case
of compiler-rt, or remove it entirely in case of libcxxabi (as it was
removed a while ago, so the statement was not doing naything). The last
use of LLVM_CONFIG_PATH was deprecated in D137024.

[mgorny]

D137024 provides backwards compatibility for LLVM_CONFIG_PATH, so we don't have to sync these changes. The idea is to push this one some time later to avoid reverts.

[phosek]

zorg/buildbot/builders/annotated/ve-linux-steps.make

215

Why is it OK to omit LLVM_CMAKE_DIR here?

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

239

I'd prefer updating this variable to point to ${ROOT}/llvm_build64 (potentially renaming it as well) and then updating all its uses below to avoid duplicating this path.

zorg/buildbot/builders/sanitizers/buildbot_qemu.sh

212

The same here, I'd prefer updating this variable to point to ${STAGE2_DIR} and then updating its uses below to avoid confusion.

[mgorny]

zorg/buildbot/builders/annotated/ve-linux-steps.make

215

Because libcxxabi didn't support LLVM_CONFIG_PATH already, so it mustn't have done anything.

[vitalybuka]

This breaks this bot https://lab.llvm.org/buildbot/#/builders/169/builds/13316

[mgorny]

In D137226#3916782, @vitalybuka wrote:

This breaks this bot https://lab.llvm.org/buildbot/#/builders/169/builds/13316

Thanks for letting me know and for the attempted fix. I'd have tried the same thing, so hopefully it'll work.

[mgorny]

It didn't seem to have worked. I don't really have an idea what's wrong there. Should I revert or do you have something else to try?

[vitalybuka]

In D137226#3916964, @mgorny wrote:

It didn't seem to have worked. I don't really have an idea what's wrong there. Should I revert or do you have something else to try?

Already fixed. https://github.com/llvm/llvm-zorg/commit/5f14d865d0c06e47dfdc68219faa2c8e4d10125d
I realized that your patch missed "cd" above, but my "readlink" was too late as well.

[mgorny]

Thanks a lot. Yeah, it didn't occur to me that the cwd could have changed at that point.

zorg/buildbot/builders/annotated/ve-linux-steps.make

cd ${CRT_BUILD_VE} && ${CMAKE} ${MONOREPO}/runtimes -G Ninja \
       -DCMAKE_C_COMPILER=${BUILT_CLANG} \
       -DCMAKE_C_COMPILER_TARGET="${VE_TARGET}" \
       -DCMAKE_CXX_COMPILER=${BUILT_CLANGXX} \
       -DCMAKE_CXX_COMPILER_TARGET="${VE_TARGET}" \
       -DCMAKE_ASM_COMPILER_TARGET="${VE_TARGET}" \
       -DCMAKE_AR=${INTREE_PREFIX}/bin/llvm-ar \
       -DCMAKE_RANLIB=${INTREE_PREFIX}/bin/llvm-ranlib \
       -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-      -DLLVM_CONFIG_PATH=${INTREE_PREFIX}/bin/llvm-config \
+      -DLLVM_CMAKE_DIR=${INTREE_PREFIX} \
       -DCMAKE_BUILD_TYPE="${CRT_BUILD_TYPE}" \
       -DCMAKE_INSTALL_PREFIX="${CLANG_RESDIR}" \
       -DCMAKE_CXX_FLAGS="-nostdlib" \
       -DCMAKE_CXX_FLAGS_RELEASE="${CRT_OPTFLAGS}" \
       -DCMAKE_C_FLAGS="-nostdlib" \
       -DCMAKE_C_FLAGS_RELEASE="${CRT_OPTFLAGS}" \
       -DCOMPILER_RT_INCLUDE_TESTS=ON \
       -DCOMPILER_RT_TEST_COMPILER=${BUILT_CLANG} \
build-libcxxabi-ve:
   cd ${LIBCXXABI_BUILD_VE} && ${CMAKE} ${MONOREPO}/runtimes -G Ninja \
               -DLLVM_ENABLE_RUNTIMES="libcxxabi" \
         -DCMAKE_C_COMPILER=${BUILT_CLANG} \
         -DCMAKE_CXX_COMPILER=${BUILT_CLANGXX} \
         -DCMAKE_AR=${INTREE_PREFIX}/bin/llvm-ar \
         -DCMAKE_RANLIB=${INTREE_PREFIX}/bin/llvm-ranlib \
         -DCMAKE_C_COMPILER_TARGET="${VE_TARGET}" \
         -DCMAKE_CXX_COMPILER_TARGET="${VE_TARGET}" \
-        -DLLVM_CONFIG_PATH=${INTREE_PREFIX}/bin/llvm-config \
         -DCMAKE_BUILD_TYPE="${LIBCXXABI_BUILD_TYPE}" \
         -DCMAKE_INSTALL_PREFIX="${CLANG_RESDIR}" \
         -DLIBCXXABI_LIBDIR_SUFFIX="${LINUX_VE_LIBSUFFIX}" \
         -DLIBCXXABI_USE_LLVM_UNWINDER=YES \
         -DCMAKE_CXX_FLAGS="-nostdlib++" \
         -DCMAKE_CXX_FLAGS_RELEASE="${LIBCXX_OPTFLAGS}" \
         -DCMAKE_C_FLAGS_RELEASE="${LIBCXX_OPTFLAGS}" \
         -DLLVM_PATH=${MONOREPO}/llvm \

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

(cd llvm_build_android_$_arch && cmake \
     $LLVM || build_failure) &
 
   local COMPILER_RT_OPTIONS="$(readlink -f $LLVM/../compiler-rt)"
   
   (cd compiler_rt_build_android_$_arch && cmake \
     ${CMAKE_COMMON_OPTIONS} \
     -DCMAKE_C_COMPILER=$CLANG_PATH \
     -DCMAKE_CXX_COMPILER=$CLANGXX_PATH \
-    -DLLVM_CONFIG_PATH=$ROOT/llvm_build64/bin/llvm-config \
+    -DLLVM_CMAKE_DIR=$ROOT/llvm_build64 \
     -DCOMPILER_RT_BUILD_BUILTINS=OFF \
     -DCOMPILER_RT_INCLUDE_TESTS=ON \
     -DCOMPILER_RT_ENABLE_WERROR=ON \
     -DCMAKE_ASM_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
     -DCMAKE_CXX_FLAGS="$ANDROID_CXX_FLAGS" \
     -DSANITIZER_CXX_ABI="libcxxabi" \
     -DCOMPILER_RT_TEST_COMPILER_CFLAGS="$ANDROID_FLAGS" \

zorg/buildbot/builders/sanitizers/buildbot_cmake.sh

if [ "$PLATFORM" == "Linux" ]; then
   check_64bit $CHECK_LSAN lsan
   check_64bit $CHECK_MSAN msan
   # check_64bit $CHECK_SCUDO scudo, No check-scudo target for this config
   check_64bit $CHECK_TSAN tsan
   check_64bit $CHECK_UBSAN ubsan
   check_64bit $CHECK_UBSAN ubsan-minimal
 fi
 
 FRESH_CLANG_PATH=${ROOT}/llvm_build64/bin
 
 echo @@@BUILD_STEP build standalone compiler-rt@@@
 if [ ! -d compiler_rt_build ]; then
   mkdir compiler_rt_build
 fi
 (cd compiler_rt_build && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
   -DCMAKE_C_COMPILER=${FRESH_CLANG_PATH}/clang \
   -DCMAKE_CXX_COMPILER=${FRESH_CLANG_PATH}/clang++ \
   -DCOMPILER_RT_INCLUDE_TESTS=ON \
   -DCOMPILER_RT_ENABLE_WERROR=ON \
-  -DLLVM_CONFIG_PATH=${FRESH_CLANG_PATH}/llvm-config \
+  -DLLVM_CMAKE_DIR=${ROOT}/llvm_build64 \
   $COMPILER_RT) || build_failure
 (cd compiler_rt_build && make -j$MAKE_JOBS) || build_failure
 
 echo @@@BUILD_STEP test standalone compiler-rt@@@
 (cd compiler_rt_build && make -j$MAKE_JOBS check-all) || build_failure
 
 HAVE_NINJA=${HAVE_NINJA:-1}
 if [ "$PLATFORM" == "Linux" -a $HAVE_NINJA == 1 ]; then

zorg/buildbot/builders/sanitizers/buildbot_qemu.sh

function configure_scudo_compiler_rt {
   rm -rf ${out_dir}
   mkdir -p ${out_dir}
 
   SCUDO_BUILDS+=" ${name}"
 
   (
     # We need a fresh base compiler to test standalone build, as this config
     # does not build own clang.
     local COMPILER_BIN_DIR="$(readlink -f ${STAGE2_DIR})/bin"
     cd ${out_dir}
 
     (
       cmake \
         ${CMAKE_COMMON_OPTIONS} \
         -DCOMPILER_RT_DEBUG=$DBG \
-        -DLLVM_CONFIG_PATH=${COMPILER_BIN_DIR}/llvm-config \
+        -DLLVM_CMAKE_DIR="${STAGE2_DIR}" \
         -DCMAKE_C_COMPILER=${COMPILER_BIN_DIR}/clang \
         -DCMAKE_CXX_COMPILER=${COMPILER_BIN_DIR}/clang++ \
         -DCOMPILER_RT_HAS_LLD=ON \
         -DCOMPILER_RT_TEST_USE_LLD=ON \
         -DCMAKE_INSTALL_PREFIX=$(${COMPILER_BIN_DIR}/clang -print-resource-dir) \
         -DCOMPILER_RT_BUILD_BUILTINS=OFF \
         -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
         -DCMAKE_CROSSCOMPILING=True \