---

yaml
---
r: 323567
b: refs/heads/tensorflow-next
c: 2d8cf9d
h: refs/heads/master
i:
  323565: 2e6a36f
  323563: e8a8f1a
  323559: 9196e9f
  323551: 599cbb3

Author: compnerd

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: de364ce54bf499e1323d2dd1280eefc252626fe7
+refs/heads/tensorflow-next: 2d8cf9d5bc94cdb75d80643710a090198fd44a7d

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

@@ -669,6 +669,10 @@ function set_build_options_for_host() {
                 -DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
                 -DSANITIZER_MIN_OSX_VERSION="${cmake_osx_deployment_target}"
                 -DLLVM_ENABLE_MODULES:BOOL="$(true_false ${LLVM_ENABLE_MODULES})"
+                # NOTE(compnerd) this explicitly sets up the python executable
+                # since we sometimes end up with python 3 and the tooling
+                # currently relies on python 2.7
+                -DPYTHON_EXECUTABLE:PATH=/usr/bin/python2.7
             )
             if [[ $(is_llvm_lto_enabled) == "TRUE" ]]; then
                 if [[ $(cmake_needs_to_specify_standard_computed_defaults) == "TRUE" ]]; then
@@ -2558,6 +2562,21 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options+=(
                       -DLLDB_CODESIGN_IDENTITY=""
                       -DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
+
+                      # NOTE(compnerd) this explicitly sets up the python
+                      # executable since we sometimes end up with python 3 and
+                      # the tooling currently relies on python 2.7
+                      -DPython_ADDITIONAL_VERSIONS="2.7"
+                      -DPYTHON_EXECUTABLE:PATH=/usr/bin/python2.7
+                      -DPYTHON_LIBRARY="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)/System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.tbd"
+                      -DPYTHON_INCLUDE_DIR="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)/System/Library/Frameworks/Python.framework/Headers"
+                    )
+                  else
+                    cmake_options+=(
+                      # NOTE(compnerd) this explicitly sets up the python
+                      # executable since we sometimes end up with python 3 and
+                      # the tooling currently relies on python 2.7
+                      -DPYTHON_EXECUTABLE:PATH=/usr/bin/python2.7
                     )
                   fi
                 fi