Author: Petr Hosek Date: 2021-03-18T23:42:31-07:00 New Revision: ce97d8e6c7409501e9b42de3db34ae0486115e25
URL: https://github.com/llvm/llvm-project/commit/ce97d8e6c7409501e9b42de3db34ae0486115e25 DIFF: https://github.com/llvm/llvm-project/commit/ce97d8e6c7409501e9b42de3db34ae0486115e25.diff LOG: Revert "[WoA][MSVC] Use default linker setting in MSVC-compatible driver" This reverts commit ace56d41aca8cac7cead9c2c97278aa50fc945b1 which broke builders that set CLANG_DEFAULT_LINKER. Added: Modified: clang/lib/Driver/ToolChains/MSVC.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp index 38ad7125b4af..96de02378ca2 100644 --- a/clang/lib/Driver/ToolChains/MSVC.cpp +++ b/clang/lib/Driver/ToolChains/MSVC.cpp @@ -11,7 +11,6 @@ #include "Darwin.h" #include "clang/Basic/CharInfo.h" #include "clang/Basic/Version.h" -#include "clang/Config/config.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/DriverDiagnostic.h" @@ -578,10 +577,7 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, // translate 'lld' into 'lld-link', and in the case of the regular msvc // linker, we need to use a special search algorithm. llvm::SmallString<128> linkPath; - StringRef Linker = Args.getLastArgValue(options::OPT_fuse_ld_EQ, - CLANG_DEFAULT_LINKER); - if (Linker.empty()) - Linker = "link"; + StringRef Linker = Args.getLastArgValue(options::OPT_fuse_ld_EQ, "link"); if (Linker.equals_lower("lld")) Linker = "lld-link"; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
