From a3ab098d5aaa50463b5fa7b99ffcb0130756a93f Mon Sep 17 00:00:00 2001 From: Laszlo Csomor Date: Thu, 16 Feb 2017 14:53:40 +0000 Subject: Bazel client, Windows: implement ConvertPath See https://github.com/bazelbuild/bazel/issues/2107 -- Change-Id: I7a325521f52bc4027b55df5451f549ac737242f8 Reviewed-on: https://cr.bazel.build/8953 PiperOrigin-RevId: 147715340 MOS_MIGRATED_REVID=147715340 --- src/main/cpp/blaze_util_windows.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc index e442af3730..73c5f35463 100644 --- a/src/main/cpp/blaze_util_windows.cc +++ b/src/main/cpp/blaze_util_windows.cc @@ -799,9 +799,10 @@ string ListSeparator() { return ";"; } string ConvertPath(const string& path) { #ifdef COMPILER_MSVC - // TODO(bazel-team): implement this. - pdie(255, "blaze::ConvertPath is not implemented on Windows"); - return ""; + // This isn't needed when the binary isn't linked against msys-2.0.dll (when + // we build with MSVC): MSYS converts all Unix paths to Windows paths for such + // binaries. + return path; #else // not COMPILER_MSVC // If the path looks like %USERPROFILE%/foo/bar, don't convert. if (path.empty() || path[0] == '%') { -- cgit v1.2.3