From: Konrad Kleine Date: Thu, 6 Jul 2023 12:05:02 +0000 (+0200) Subject: [lld] respect LLVM_EXTERNAL_LIT X-Git-Tag: upstream/17.0.6~2700 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58fb2c7a6c5edc973ca99eaff6ae73fd032b10b2;p=platform%2Fupstream%2Fllvm.git [lld] respect LLVM_EXTERNAL_LIT Consider a setup without a system-wide installation of lit. Instead you pass the path to lit like this: ``` cmake ... -DLLVM_EXTERNAL_LIT= ... ``` Then you will run into this error: ``` ninja: error: unknown target 'check-lld' ``` I have a buildbot builder that fails with this message. Here's the passage that triggers this error: https://github.com/llvm/llvm-zorg/blob/d3bfd5ccbceb542098c350e4d071ceceac6854cb/zorg/buildbot/builders/annotated/standalone-build.sh#L194-L239 By using `LLVM_EXTERNAL_LIT` instead of `LLVM_LIT` we fix this problem. See [here](https://llvm.org/docs/GettingStarted.html#stand-alone-builds) for a description: > Both the LLVM_ROOT and LLVM_EXTERNAL_LIT options are required to do stand-alone builds for all sub-projects. Additional required options for each sub-project can be found in the table below. Differential Revision: https://reviews.llvm.org/D154599 --- diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index 1ffcf2d..595c286 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -61,7 +61,7 @@ if(LLD_BUILT_STANDALONE) if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) # Note: path not really used, except for checking if lit was found - set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) + set(LLVM_EXTERNAL_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) if(NOT LLVM_UTILS_PROVIDED) add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/FileCheck utils/FileCheck) add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/not utils/not) @@ -74,13 +74,13 @@ if(LLD_BUILT_STANDALONE) endif() else() # Seek installed Lit. - find_program(LLVM_LIT + find_program(LLVM_EXTERNAL_LIT NAMES llvm-lit lit.py lit PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit" DOC "Path to lit.py") endif() - if(LLVM_LIT) + if(LLVM_EXTERNAL_LIT) # Define the default arguments to use with 'lit', and an option for the user # to override. set(LIT_ARGS_DEFAULT "-sv")