---

yaml
---
r: 348664
b: refs/heads/master
c: 6e6de9e
h: refs/heads/master

Author: JDevlieghere

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2585d6c78c12392bb362bd74748b143295772387
+refs/heads/master: 6e6de9eba34c8bf67741f5a7d817ce42d4dfd1ea
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/utils/build-script-impl

@@ -2439,13 +2439,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     "${lldb_cmake_options[@]}"
                     )
 
-                if [ ! -z "${LLDB_EXTRA_CMAKE_ARGS}" ]; then
-                    cmake_options=(
-                        "${cmake_options[@]}"
-                        ${LLDB_EXTRA_CMAKE_ARGS}
-                        )
-                fi
-
                 # Figure out if we think this is a buildbot build.
                 # This will influence the lldb version line.
                 if [ ! -z "${JENKINS_HOME}" -a ! -z "${JOB_NAME}" -a ! -z "${BUILD_NUMBER}" ]; then
@@ -2518,11 +2511,20 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DLLDB_TEST_USER_ARGS="${DOTEST_ARGS}"
                 )
 
-                if [[ "$(uname -s)" == "Darwin" ]] ; then
+                if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_USE_SYSTEM_DEBUGSERVER})" == "TRUE" ]]; then
                   cmake_options+=(
                     -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
                   )
                 fi
+
+                # Add the extra CMake args at the end so they can override
+                # values set earlier.
+                if [ ! -z "${LLDB_EXTRA_CMAKE_ARGS}" ]; then
+                    cmake_options=(
+                        "${cmake_options[@]}"
+                        ${LLDB_EXTRA_CMAKE_ARGS}
+                        )
+                fi
                 ;;
             llbuild)
                 cmake_options=(