[llvm] 2d460f2 - Attempt to fix test on Windows.

[Adrian Prantl via llvm-commits]

Author: Adrian Prantl
Date: 2023-11-03T18:27:41-07:00
New Revision: 2d460f25f14db38e566810040806c95f9edd78b5

URL: https://github.com/llvm/llvm-project/commit/2d460f25f14db38e566810040806c95f9edd78b5
DIFF: https://github.com/llvm/llvm-project/commit/2d460f25f14db38e566810040806c95f9edd78b5.diff

LOG: Attempt to fix test on Windows.

I'm assuming that because sys::path::append defaults to native path
this fails. Since dsymutil is a Darwin tool, we can just hardcode the
UNIX path separator.

Added: 
    

Modified: 
    llvm/lib/DWARFLinker/DWARFLinker.cpp
    llvm/lib/DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp
index d891e7205aa6cc7..1a7ea47adc5ca3f 100644
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp
@@ -187,7 +187,7 @@ static SmallString<128> guessToolchainBaseDir(StringRef SysRoot) {
     return Result;
   Base = sys::path::parent_path(Base);
   Result = Base;
-  sys::path::append(Result, "Toolchains");
+  Result += "/Toolchains";
   return Result;
 }
 

diff  --git a/llvm/lib/DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp b/llvm/lib/DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp
index 7cd9776227836ce..c1181a264f879f0 100644
--- a/llvm/lib/DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp
+++ b/llvm/lib/DWARFLinkerParallel/DWARFLinkerCompileUnit.cpp
@@ -177,7 +177,7 @@ static SmallString<128> guessToolchainBaseDir(StringRef SysRoot) {
     return Result;
   Base = sys::path::parent_path(Base);
   Result = Base;
-  sys::path::append(Result, "Toolchains");
+  Result += "/Toolchains";
   return Result;
 }