summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2019-10-11 23:22:36 +0000
committerNico Weber <nicolasweber@gmx.de>2019-10-11 23:22:36 +0000
commit1b82fb61c18474473ea21123b9a150e1a88dddbf (patch)
tree91be9eb19a37b0a913e5a42841e169a7aa2b27b9
parent92e11e6d394df8acaed857724b27f57823143a0e (diff)
downloadbcm5719-llvm-1b82fb61c18474473ea21123b9a150e1a88dddbf.tar.gz
bcm5719-llvm-1b82fb61c18474473ea21123b9a150e1a88dddbf.zip
gn build: (manually) merge r374606 better
llvm-svn: 374611
-rw-r--r--llvm/utils/gn/secondary/libunwind/src/BUILD.gn7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
index 559993697b3..9b118045b24 100644
--- a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
@@ -24,7 +24,6 @@ if (target_os == "mac") {
}
unwind_sources = [
- "Unwind_AppleExtras.cpp",
"libunwind.cpp",
"Unwind-EHABI.cpp",
"Unwind-seh.cpp",
@@ -46,7 +45,11 @@ unwind_sources = [
"UnwindCursor.hpp",
]
if (target_os == "mac") {
- unwind_sources += [ "src/Unwind_AppleExtras.cpp" ]
+ unwind_sources += [
+ # This comment prevents `gn format` from putting the file on the same line
+ # as `sources +=`, for sync_source_lists_from_cmake.py.
+ "Unwind_AppleExtras.cpp",
+ ]
}
config("unwind_config") {
OpenPOWER on IntegriCloud