From 45fc90326a1fa7745f06d5c8d4c3410a16da7fbf Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Fri, 19 Apr 2019 18:29:17 +0000 Subject: [PATCH] [gn] Support dots in CMake paths in the sync script Some file paths use dots to pick up sources from parent directories. Differential Revision: https://reviews.llvm.org/D60734 llvm-svn: 358774 --- compiler-rt/lib/sanitizer_common/CMakeLists.txt | 1 - llvm/utils/gn/build/sync_source_lists_from_cmake.py | 2 +- llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index 094d829..7579416 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -119,7 +119,6 @@ set(SANITIZER_IMPL_HEADERS sanitizer_common_interceptors.inc sanitizer_common_interceptors_format.inc sanitizer_common_interceptors_ioctl.inc - sanitizer_common_interceptors_vfork_aarch64.inc.S sanitizer_common_interface.inc sanitizer_common_interface_posix.inc sanitizer_common_syscalls.inc diff --git a/llvm/utils/gn/build/sync_source_lists_from_cmake.py b/llvm/utils/gn/build/sync_source_lists_from_cmake.py index 480b5aa..3fb155c 100755 --- a/llvm/utils/gn/build/sync_source_lists_from_cmake.py +++ b/llvm/utils/gn/build/sync_source_lists_from_cmake.py @@ -25,7 +25,7 @@ def sync_source_lists(): # Matches e.g. | "foo.cpp",|, captures |foo| in group 1. gn_cpp_re = re.compile(r'^\s*"([^"]+\.(?:cpp|c|h|S))",$', re.MULTILINE) # Matches e.g. | foo.cpp|, captures |foo| in group 1. - cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9/-]+\.(?:cpp|c|h|S))$', + cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9./-]+\.(?:cpp|c|h|S))$', re.MULTILINE) for gn_file in gn_files: diff --git a/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn index 7417e59..59420c8 100644 --- a/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn @@ -73,6 +73,7 @@ target(libclang_target_type, "libclang") { "CXType.h", "Index_Internal.h", "Indexing.cpp", + "../../include/clang-c/Index.h", ] if (host_os == "mac") { ldflags = [ -- 2.7.4