Merge pull request swiftlang#23953 from adrian-prantl/debugserver

swift-ci · web-flow · commit 078b9f5af437 · 2019-04-11T13:24:08.000-07:00
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -2534,7 +2534,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options+=(
                       -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
-                      -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL=TRUE
+                      -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
                       -DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"
                     )
                   fi

Original file line number	Diff line number	Diff line change
`@@ -2534,7 +2534,7 @@ 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`
	`2537`	`+ -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"`
`2538`	`2538`	`-DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"`
`2539`	`2539`	`)`
`2540`	`2540`	`fi`