windows: GetOutputRoot() returns GetHomeDir()

This is an immediate fix for a very nasty bug: #5038 Change-Id: I5e4f9fa13e5ac785514bc0dc4ce6cba9a88f33bb Closes #5039. Change-Id: I5e4f9fa13e5ac785514bc0dc4ce6cba9a88f33bb PiperOrigin-RevId: 193315571
bazelbuild · Apr 19, 2018 · 4b9e096 · 4b9e096
1 parent fdee70e
commit 4b9e096
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc
@@ -202,19 +202,12 @@ string GetSelfPath() {
 }
 
 string GetOutputRoot() {
-  for (const char* i : {"TMPDIR", "TEMPDIR", "TMP", "TEMP"}) {
-    string tmpdir(GetEnv(i));
-    if (!tmpdir.empty()) {
-      return tmpdir;
-    }
-  }
-
-  WCHAR buffer[kWindowsPathBufferSize] = {0};
-  if (!::GetTempPathW(kWindowsPathBufferSize, buffer)) {
-    die(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR,
-        "GetOutputRoot: GetTempPathW: %s", GetLastErrorString().c_str());
+  string home = GetHomeDir();
+  if (home.empty()) {
+    BAZEL_DIE(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR)
+        << "Cannot find a good output root. Use the --output_user_root flag.";
   }
-  return string(blaze_util::WstringToCstring(buffer).get());
+  return home;
 }
 
 string GetHomeDir() {