[PATCH] D60734: [gn] Support dots in CMake paths in the sync script

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added a reviewer: thakis.
Herald added subscribers: llvm-commits, Sanitizers, mgorny, kubamracek.
Herald added projects: Sanitizers, LLVM.

Some file paths use dots to pick up sources from parent directories.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D60734

Files:
  compiler-rt/lib/sanitizer_common/CMakeLists.txt
  llvm/utils/gn/build/sync_source_lists_from_cmake.py
  llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn


Index: llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn
+++ llvm/utils/gn/secondary/clang/tools/libclang/BUILD.gn
@@ -73,6 +73,7 @@
     "CXType.h",
     "Index_Internal.h",
     "Indexing.cpp",
+    "../../include/clang-c/Index.h",
   ]
   if (host_os == "mac") {
     ldflags = [
Index: llvm/utils/gn/build/sync_source_lists_from_cmake.py
===================================================================
--- llvm/utils/gn/build/sync_source_lists_from_cmake.py
+++ llvm/utils/gn/build/sync_source_lists_from_cmake.py
@@ -25,7 +25,7 @@
     # 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:
Index: compiler-rt/lib/sanitizer_common/CMakeLists.txt
===================================================================
--- compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -119,7 +119,6 @@
   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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60734.195259.patch
Type: text/x-patch
Size: 1627 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190415/fa2b33f1/attachment.bin>