2 files changed, 3 insertions, 13 deletions
diff --git a/lib/Core/CMakeLists.txt b/lib/Core/CMakeLists.txt
index d89ca4a63d728..7f4c47f14b90a 100644
--- a/lib/Core/CMakeLists.txt
+++ b/lib/Core/CMakeLists.txt
@@ -12,6 +12,6 @@ add_lld_library(lldCore
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Core
 
-  LINK_LIBS
-    LLVMSupport
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lib/Core/Reproduce.cpp b/lib/Core/Reproduce.cpp
index ab7261fa0e75b..e3629a93cbe39 100644
--- a/lib/Core/Reproduce.cpp
+++ b/lib/Core/Reproduce.cpp
@@ -39,7 +39,7 @@ std::string lld::relativeToRoot(StringRef Path) {
     Res = Root.substr(2);
 
   path::append(Res, path::relative_path(Abs));
-  return convertToUnixPathSeparator(Res);
+  return path::convert_to_slash(Res);
 }
 
 // Quote a given string if it contains a space character.
@@ -64,13 +64,3 @@ std::string lld::toString(opt::Arg *Arg) {
     return K + V;
   return K + " " + V;
 }
-
-std::string lld::convertToUnixPathSeparator(StringRef S) {
-#ifdef LLVM_ON_WIN32
-  std::string Ret = S.str();
-  std::replace(Ret.begin(), Ret.end(), '\\', '/');
-  return Ret;
-#else
-  return S;
-#endif
-}