Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit 85d5d16dc6a6 · 2019-04-07T13:10:04.000-07:00
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -2534,6 +2534,8 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options+=(
                       -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
+                      -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL=TRUE
+                      -DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"
                     )
                   fi
                 fi

Original file line number	Diff line number	Diff line change
`@@ -2534,6 +2534,8 @@ for host in "${ALL_HOSTS[@]}"; do`
`2534`	`2534`	`cmake_options+=(`
`2535`	`2535`	`-DLLDB_BUILD_FRAMEWORK:BOOL=TRUE`
`2536`	`2536`	`-DLLDB_CODESIGN_IDENTITY=""`
	`2537`	`+ -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL=TRUE`
	`2538`	`+ -DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"`
`2537`	`2539`	`)`
`2538`	`2540`	`fi`
`2539`	`2541`	`fi`