1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/cpp/blaze_util.cc b/src/main/cpp/blaze_util.cc
index fc31b4ba28..2831ead175 100644
--- a/src/main/cpp/blaze_util.cc
+++ b/src/main/cpp/blaze_util.cc
@@ -38,10 +38,11 @@ using std::vector;
 const char kServerPidFile[] = "server.pid.txt";
 
 string MakeAbsolute(const string &path) {
-  // Check if path is already absolute.
-  // TODO(laszlocsomor): remove the "path.empty() ||" clause; empty paths are
-  // not absolute!
-  if (path.empty() || blaze_util::IsAbsolute(path)) {
+  if (path.empty()) {
+    return blaze_util::GetCwd();
+  }
+
+  if (blaze_util::IsAbsolute(path)) {
     return path;
   }