Merge pull request #22369 from compnerd/testing-is-for-the-weak

compnerd · web-flow · commit d5f530cd7fef · 2019-02-05T08:25:27.000-08:00
utils: fix cmake build of lldb on macOS
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -2541,12 +2541,12 @@ for host in "${ALL_HOSTS[@]}"; do
                       -DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})
                   )
 
-                  if [[ ${LLDB_BUILD_ON_MACOS} ]] ; then
+                  if [[ "$(uname -s)" == "Darwin" ]] ; then
                     cmake_options+=(
                       -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
                     )
-                    if "${ENABLE_ASAN}" ]] ; then
+                    if [[ "${ENABLE_ASAN}" ]] ; then
                       # Limit the number of parallel tests
                       LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu | awk '{ print $2 }')"
                     fi

Original file line number	Diff line number	Diff line change
`@@ -2541,12 +2541,12 @@ for host in "${ALL_HOSTS[@]}"; do`
`2541`	`2541`	`-DLLDB_INCLUDE_TESTS:BOOL=$(false_true ${BUILD_TOOLCHAIN_ONLY})`
`2542`	`2542`	`)`
`2543`	`2543`
`2544`		`- if [[ ${LLDB_BUILD_ON_MACOS} ]] ; then`
	`2544`	`+ if [[ "$(uname -s)" == "Darwin" ]] ; then`
`2545`	`2545`	`cmake_options+=(`
`2546`	`2546`	`-DLLDB_BUILD_FRAMEWORK:BOOL=TRUE`
`2547`	`2547`	`-DLLDB_CODESIGN_IDENTITY=""`
`2548`	`2548`	`)`
`2549`		`- if "${ENABLE_ASAN}" ]] ; then`
	`2549`	`+ if [[ "${ENABLE_ASAN}" ]] ; then`
`2550`	`2550`	`# Limit the number of parallel tests`
`2551`	`2551`	`LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu \| awk '{ print $2 }')"`
`2552`	`2552`	`fi`