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

Author: Amit Patankar

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
 

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

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