---

yaml
---
r: 349495
b: refs/heads/master-next
c: 648af5e
h: refs/heads/master
i:
  349493: 771b7b8
  349491: 056e67b
  349487: 6bc07e4

Author: JDevlieghere

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: f2215943d8e8554ce962d64259aa0ecb5e1b7c64
+refs/heads/master-next: 648af5e2d688c52348075dd2d2221c20d64c21f1
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/utils/build-script-impl

@@ -2472,11 +2472,10 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DLLDB_SWIFTC:PATH="$(build_directory ${LOCAL_HOST} swift)/bin/swiftc"
                     -DLLDB_SWIFT_LIBS:PATH="$(build_directory ${LOCAL_HOST} swift)/lib/swift"
                     -DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
-                    -DClang_DIR:PATH=${llvm_build_dir}/lib/cmake/clang
                     -DLLVM_DIR:PATH=${llvm_build_dir}/lib/cmake/llvm
-                    -DLLDB_PATH_TO_CLANG_BUILD:PATH="${llvm_build_dir}"
+                    -DClang_DIR:PATH=${llvm_build_dir}/lib/cmake/clang
+                    -DSwift_DIR:PATH=${swift_build_dir}/lib/cmake/swift
                     -DLLDB_PATH_TO_SWIFT_SOURCE:PATH="${SWIFT_SOURCE_DIR}"
-                    -DLLDB_PATH_TO_SWIFT_BUILD:PATH="${swift_build_dir}"
                     -DLLDB_IS_BUILDBOT_BUILD:BOOL="${LLDB_IS_BUILDBOT_BUILD}"
                     -DLLDB_BUILD_DATE:STRING="\"${LLDB_BUILD_DATE}\""
                     -DLLDB_ALLOW_STATIC_BINDINGS:BOOL=1