[all-commits] [llvm/llvm-project] ed9867: Support multi-configuration generators correctly i...

Stella Stamenova via All-commits all-commits at lists.llvm.org
Thu Feb 11 09:32:47 PST 2021


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: ed98676fa4833bb80632fc7c9db10c3328d78485
      https://github.com/llvm/llvm-project/commit/ed98676fa4833bb80632fc7c9db10c3328d78485
  Author: Stella Stamenova <stilis at microsoft.com>
  Date:   2021-02-11 (Thu, 11 Feb 2021)

  Changed paths:
    M clang/test/Unit/lit.site.cfg.py.in
    M lld/test/CMakeLists.txt
    M lld/test/Unit/lit.site.cfg.py.in
    M lld/test/lit.site.cfg.py.in
    M lldb/test/API/lit.site.cfg.py.in
    M llvm/cmake/modules/AddLLVM.cmake
    M llvm/test/CMakeLists.txt
    M llvm/test/Unit/lit.site.cfg.py.in
    M llvm/test/lit.site.cfg.py.in
    M mlir/examples/standalone/test/lit.site.cfg.py.in
    M mlir/integration_test/lit.site.cfg.py.in
    M mlir/test/Unit/lit.site.cfg.py.in
    M mlir/test/lit.site.cfg.py.in

  Log Message:
  -----------
  Support multi-configuration generators correctly in several config files

Multi-configuration generators (such as Visual Studio and Xcode) allow the specification of a build flavor at build time instead of config time, so the lit configuration files need to support that - and they do for the most part. There are several places that had one of two issues (or both!):

1) Paths had %(build_mode)s set up, but then not configured, resulting in values that would not work correctly e.g. D:/llvm-build/%(build_mode)s/bin/dsymutil.exe
2) Paths did not have %(build_mode)s set up, but instead contained $(Configuration) (which is the value for Visual Studio at configuration time, for Xcode they would have had the equivalent) e.g. "D:/llvm-build/$(Configuration)/lib".

This seems to indicate that we still have a lot of fragility in the configurations, but also that a number of these paths are never used (at least on Windows) since the errors appear to have been there a while.

This patch fixes the configurations and it has been tested with Ninja and Visual Studio to generate the correct paths. We should consider removing some of these settings altogether.

Reviewed By: JDevlieghere, mehdi_amini

Differential Revision: https://reviews.llvm.org/D96427




More information about the All-commits mailing list