---

yaml
---
r: 338941
b: refs/heads/rxwei-patch-1
c: 73b20f3
h: refs/heads/master
i:
  338939: 709d0f9

Author: pschuh

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: bb717d4ab688714d4e801f96c172e18ec08d404c
+refs/heads/rxwei-patch-1: 73b20f32963cb453bbf3784f75d61473817c0922
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/utils/build-presets.ini

@@ -2023,7 +2023,6 @@ darwin-toolchain-application-cert=lldb_codesign
 # Instead, options are copied here individually.
 [preset: tensorflow_osx_base]
 mixin-preset=mixin_lightweight_assertions
-legacy-impl
 
 ### From: mixin_osx_package_base
 lldb
@@ -2119,21 +2118,13 @@ darwin-toolchain-installer-package=%(darwin_toolchain_installer_package)s
 
 [preset: tensorflow_linux]
 mixin-preset=buildbot_linux
-legacy-impl
-indexstore-db=0
-sourcekit-lsp=0
-toolchain-benchmarks=0
 enable-tensorflow
 install-tensorflow
 # The swift-package-tests fail when run with python3.
 test-installable-package=
 
 [preset: tensorflow_linux,no_test]
 mixin-preset=buildbot_linux,no_test
-legacy-impl
-indexstore-db=0
-sourcekit-lsp=0
-toolchain-benchmarks=0
 enable-tensorflow
 install-tensorflow
 # The swift-package-tests fail when run with python3.
@@ -2185,7 +2176,6 @@ mixin-preset=mixin_lightweight_assertions
 enable-tensorflow
 release
 test
-legacy-impl
 test-optimized
 validation-test
 

branches/rxwei-patch-1/utils/build-script-impl

@@ -2551,6 +2551,20 @@ for host in "${ALL_HOSTS[@]}"; do
 
                 if [[ "${ENABLE_TENSORFLOW}" ]] ; then
                     # Verify TensorFlow include/library directories.
+                    if [[ ! "${TENSORFLOW_HOST_INCLUDE_DIR}" ]] ; then
+                       TENSORFLOW_HOST_INCLUDE_DIR="$TENSORFLOW_SOURCE_DIR"
+                    fi
+                    if [[ ! "${TENSORFLOW_HOST_LIB_DIR}" ]] ; then
+                       TENSORFLOW_HOST_LIB_DIR="$TENSORFLOW_SOURCE_DIR/bazel-bin/tensorflow"
+                    fi
+
+                    if [[ ! "${TENSORFLOW_TARGET_LIB_DIR}" ]] ; then
+                        TENSORFLOW_TARGET_LIB_DIR="${TENSORFLOW_HOST_LIB_DIR}"
+                    fi
+                    if [[ ! "${TENSORFLOW_TARGET_INCLUDE_DIR}" ]] ; then
+                        TENSORFLOW_TARGET_INCLUDE_DIR="${TENSORFLOW_HOST_INCLUDE_DIR}"
+                    fi
+
                     verify_tensorflow_directories
 
                     # Copy TensorFlow libraries to correct destination.
@@ -2569,12 +2583,6 @@ for host in "${ALL_HOSTS[@]}"; do
                         find "${TENSORFLOW_HOST_LIB_DIR}" \( -regex "${lib}" -o -regex "${dylib}" \) -exec cp -p {} "${TF_LIB_DIR}" \;
                     done
 
-                    if [[ ! "${TENSORFLOW_TARGET_LIB_DIR}" ]] ; then
-                        TENSORFLOW_TARGET_LIB_DIR="${TENSORFLOW_HOST_LIB_DIR}"
-                    fi
-                    if [[ ! "${TENSORFLOW_TARGET_INCLUDE_DIR}" ]] ; then
-                        TENSORFLOW_TARGET_INCLUDE_DIR="${TENSORFLOW_HOST_INCLUDE_DIR}"
-                    fi
                     cmake_options=(
                         "${cmake_options[@]}"
                         -DSWIFT_ENABLE_TENSORFLOW:BOOL=TRUE
@@ -3028,12 +3036,6 @@ for host in "${ALL_HOSTS[@]}"; do
                 with_pushd "${source_dir}" \
                     call bazel build -c opt "${TENSORFLOW_BAZEL_OPTIONS[@]}" --define framework_shared_object=false //tensorflow:libtensorflow.so //tensorflow:libtensorflow_framework.so
 
-                # Set TensorFlow include/lib directories.
-                TENSORFLOW_HOST_INCLUDE_DIR="${source_dir}"
-                TENSORFLOW_HOST_LIB_DIR="${source_dir}/bazel-bin/tensorflow"
-                TENSORFLOW_TARGET_INCLUDE_DIR="${source_dir}"
-                TENSORFLOW_TARGET_LIB_DIR="${source_dir}/bazel-bin/tensorflow"
-
                 # TensorFlow builds itself and doesn't use CMake.
                 continue
                 ;;