Fixes for Windows build.

Craigacp · karllessard · commit 7975aa91c861 · 2024-02-24T10:07:50.000-05:00
diff --git a/tensorflow-core/tensorflow-core-native/WORKSPACE b/tensorflow-core/tensorflow-core-native/WORKSPACE
@@ -15,7 +15,7 @@ http_archive(
     patch_args = ["-p1"],
     patch_cmds = [
         "find tensorflow third_party/xla/third_party/tsl -name \\*.proto | xargs sed -i.bak '/^option java_package/d'",
-        "find tensorflow third_party/xla/third_party/tsl -name \\*.proto | xargs sed -i.bak 's/^package tensorflow\\([^;\\s]*\\).*$/package tensorflow\\1;\\roption java_package = \"org.tensorflow.proto\\1\";/'",
+        "find tensorflow third_party/xla/third_party/tsl -name \\*.proto | xargs sed -i.bak 's/^package tensorflow\\([^;]*\\).*$/package tensorflow\\1;\\noption java_package = \"org.tensorflow.proto\\1\";/'",
     ],
     urls = [
        "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.15.0.tar.gz",
@@ -115,4 +115,4 @@ tf_workspace1()
 
 load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
 
-tf_workspace0()
+tf_workspace0()
diff --git a/tensorflow-core/tensorflow-core-native/scripts/bazel_clean.sh b/tensorflow-core/tensorflow-core-native/scripts/bazel_clean.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
-${BAZEL_CMD:=bazel} clean
+set -eu
+source $(pwd -P)/scripts/bazel_common.sh
+${BAZEL_CMD:=bazel} clean
