diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -568,8 +568,13 @@ } // If we're passed -fuse-ld= with no argument, or with the argument ld, // then use whatever the default system linker is. - if (UseLinker.empty() || UseLinker == "ld") - return GetProgramPath(getDefaultLinker()); + if (UseLinker.empty() || UseLinker == "ld") { + const char *DefaultLinker = getDefaultLinker(); + if (!llvm::sys::path::is_absolute(DefaultLinker)) + return GetProgramPath(DefaultLinker); + else + return std::string(DefaultLinker); + } // Extending -fuse-ld= to an absolute or relative path is unexpected. Checking // for the linker flavor is brittle. In addition, prepending "ld." or "ld64." diff --git a/clang/lib/Driver/ToolChains/Solaris.h b/clang/lib/Driver/ToolChains/Solaris.h --- a/clang/lib/Driver/ToolChains/Solaris.h +++ b/clang/lib/Driver/ToolChains/Solaris.h @@ -65,6 +65,11 @@ SanitizerMask getSupportedSanitizers() const override; unsigned GetDefaultDwarfVersion() const override { return 2; } + const char *getDefaultLinker() const override { + // clang currently uses Solaris ld-only options. + return "/usr/bin/ld"; + } + protected: Tool *buildAssembler() const override; Tool *buildLinker() const override;