Merge pull request #3595 from jpsim/sourcekit-linux-inproc

akyrtzi · web-flow · commit 02f32984b428 · 2016-07-19T16:45:53.000-07:00
[SourceKit] use "inproc" variant of SourceKit on Linux
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -1748,7 +1748,7 @@ for host in "${ALL_HOSTS[@]}"; do
         )
     fi
 
-    if [[ "${ENABLE_ASAN}" ]] ; then
+    if [[ "${ENABLE_ASAN}" || "$(uname -s)" == "Linux" ]] ; then
         swift_cmake_options=(
             "${swift_cmake_options[@]}"
             -DSWIFT_SOURCEKIT_USE_INPROC_LIBRARY:BOOL=TRUE

Original file line number	Diff line number	Diff line change
`@@ -1748,7 +1748,7 @@ for host in "${ALL_HOSTS[@]}"; do`
`1748`	`1748`	`)`
`1749`	`1749`	`fi`
`1750`	`1750`
`1751`		`- if [[ "${ENABLE_ASAN}" ]] ; then`
	`1751`	`+ if [[ "${ENABLE_ASAN}" \|\| "$(uname -s)" == "Linux" ]] ; then`
`1752`	`1752`	`swift_cmake_options=(`
`1753`	`1753`	`"${swift_cmake_options[@]}"`
`1754`	`1754`	`-DSWIFT_SOURCEKIT_USE_INPROC_LIBRARY:BOOL=TRUE`