diff options
| -rw-r--r-- | llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn | 9 | ||||
| -rw-r--r-- | llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn | 2 | ||||
| -rw-r--r-- | llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn | 14 |
3 files changed, 13 insertions, 12 deletions
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn index 56acafe03f5..faaf2de8c0c 100644 --- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn +++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn @@ -45,12 +45,13 @@ write_lit_config("lit_unit_site_cfg") { # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER. input = "//clang-tools-extra/clangd/unittests/lit.site.cfg.py.in" output = clangd_lit_unit_site_cfg_file - extra_values = - [ "CMAKE_CURRENT_BINARY_DIR=" + + extra_values = [ + "CMAKE_CURRENT_BINARY_DIR=" + rebase_path(get_label_info("//clang-tools-extra/clangd/unittests", "target_out_dir")), - "CMAKE_CURRENT_SOURCE_DIR=" + - rebase_path("//clang-tools-extra/clangd/unittest")] + "CMAKE_CURRENT_SOURCE_DIR=" + + rebase_path("//clang-tools-extra/clangd/unittest"), + ] if (host_os == "win") { # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin") ] diff --git a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn index efc84e65ec0..d84d57d0d71 100644 --- a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn +++ b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn @@ -64,7 +64,7 @@ if (target_os == "linux" || target_os == "fuchsia") { cxxabi_sources += [ # This comment prevents `gn format` from putting the file on the same line # as `sources +=`, for sync_source_lists_from_cmake.py. - "cxa_thread_atexit.cpp" + "cxa_thread_atexit.cpp", ] } diff --git a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn index d1a2d97e9bc..c3e43750319 100644 --- a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn @@ -1,5 +1,5 @@ -import("//clang-tools-extra/test/clang_tools_extra_lit_site_cfg_files.gni") import("//clang-tools-extra/clangd/test/clangd_lit_site_cfg_files.gni") +import("//clang-tools-extra/test/clang_tools_extra_lit_site_cfg_files.gni") import("//clang/test/clang_lit_site_cfg_files.gni") import("//lld/test/lld_lit_site_cfg_files.gni") import("//llvm/test/llvm_lit_site_cfg_files.gni") @@ -43,12 +43,12 @@ write_cmake_config("llvm-lit") { config_map += "map_config('" + rebase_path("//clang-tools-extra/test/Unit/lit.cfg.py") + "', '" + rebase_path(clang_tools_extra_lit_unit_site_cfg_file) + "')\n" - config_map += - "map_config('" + rebase_path("//clang-tools-extra/clangd/test/lit.cfg.py") + - "', '" + rebase_path(clangd_lit_site_cfg_file) + "')\n" - config_map += - "map_config('" + rebase_path("//clang-tools-extra/clang/unittests/lit.cfg.py") + - "', '" + rebase_path(clangd_lit_unit_site_cfg_file) + "')\n" + config_map += "map_config('" + + rebase_path("//clang-tools-extra/clangd/test/lit.cfg.py") + + "', '" + rebase_path(clangd_lit_site_cfg_file) + "')\n" + config_map += "map_config('" + + rebase_path("//clang-tools-extra/clang/unittests/lit.cfg.py") + + "', '" + rebase_path(clangd_lit_unit_site_cfg_file) + "')\n" config_map += "map_config('" + rebase_path("//clang/test/lit.cfg.py") + "', '" + rebase_path(clang_lit_site_cfg_file) + "')\n" config_map += "map_config('" + rebase_path("//clang/test/Unit/lit.cfg.py") + |
