diff options
| author |  Amit Patankar <amitpatankar@google.com> | 2018-06-04 14:26:09 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-06-04 14:28:52 -0700 |
| commit | 3c87b99d8c8052c3b6d67190bca14ea89137221a (patch) | |
| tree | 967671ad15143192de0b6019283506086913d279 | |
| parent | 204fcd9a002aa8678c42d076553e38d69e8724a6 (diff) | |
Remove --distinct_host_configuration=false from tools/bazel.rc
Don't use --distinct_host_configuration=false by default, because it would break cross compiling, like android build and Raspberry Pi build.
Instead, we add it for builds that we know they have the same host and target platforms.
PiperOrigin-RevId: 199194260
| -rwxr-xr-x | tensorflow/tools/ci_build/pi/build_raspberry_pi.sh | 1 | ||||
| -rw-r--r-- | tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh | 4 | ||||
| -rw-r--r-- | tools/bazel.rc | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/tensorflow/tools/ci_build/pi/build_raspberry_pi.sh b/tensorflow/tools/ci_build/pi/build_raspberry_pi.sh index 30ea8539aa..1bd1852ffc 100755 --- a/tensorflow/tools/ci_build/pi/build_raspberry_pi.sh +++ b/tensorflow/tools/ci_build/pi/build_raspberry_pi.sh @@ -100,7 +100,6 @@ bazel build -c opt ${PI_COPTS} \ --copt=-fomit-frame-pointer --cpu=armeabi \ --crosstool_top=@local_config_arm_compiler//:toolchain \ --verbose_failures \ - --distinct_host_configuration=true \ //tensorflow/tools/benchmark:benchmark_model \ //tensorflow/tools/pip_package:build_pip_package diff --git a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh index 1b1c3815d8..0b13b97209 100644 --- a/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh +++ b/tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh @@ -73,6 +73,10 @@ if [[ "$release_build" != 1 ]]; then echo "build --define=override_eigen_strong_inline=true" >> "${TMP_BAZELRC}" fi +# The host and target platforms are the same in Windows build. So we don't have +# to distinct them. This helps avoid building the same targets twice. +echo "build --distinct_host_configuration=false" >> "${TMP_BAZELRC}" + echo "import %workspace%/${TMP_BAZELRC}" >> .bazelrc run_configure_for_cpu_build diff --git a/tools/bazel.rc b/tools/bazel.rc index 03aa52da1f..1c1e6afb65 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -1,14 +1,8 @@ -# By default, we don't distinct target and host platfroms. -# When doing cross compilation, use --config=cross_compile to distinct them. -build --distinct_host_configuration=false -build:cross_compile --distinct_host_configuration=true - # Android configs. Bazel needs to have --cpu and --fat_apk_cpu both set to the # target CPU to build transient dependencies correctly. See # https://docs.bazel.build/versions/master/user-manual.html#flag--fat_apk_cpu build:android --crosstool_top=//external:android/crosstool build:android --host_crosstool_top=@bazel_tools//tools/cpp:toolchain -build:android --config=cross_compile build:android_arm --config=android build:android_arm --cpu=armeabi-v7a build:android_arm --fat_apk_cpu=armeabi-v7a |