diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-10-27 18:10:19 +0000 |
|---|---|---|
| committer | Sam Clegg <sbc@chromium.org> | 2017-10-27 18:10:19 +0000 |
| commit | 471d7afdf06e26af506b07dc70e35df2dc0ff078 (patch) | |
| tree | 976774cb2367b7845b11da53940d3f9661245940 /clang/lib/Driver/ToolChain.cpp | |
| parent | 3fa55c50263873e1c96a4611424fd67c6f0cae0e (diff) | |
| download | bcm5719-llvm-471d7afdf06e26af506b07dc70e35df2dc0ff078.tar.gz bcm5719-llvm-471d7afdf06e26af506b07dc70e35df2dc0ff078.zip | |
[WebAssembly] Add crt1.o with calling lld
Also, for OS unknown targets like wasm, don't include
'unknown' in the library path. This is a fix for rL316719.
Differential Revision: https://reviews.llvm.org/D39354
llvm-svn: 316777
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 12699471662..416d78509d1 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -309,14 +309,12 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC, std::string ToolChain::getCompilerRTPath() const { SmallString<128> Path(getDriver().ResourceDir); - StringRef OSLibName; - if (Triple.isOSFreeBSD()) - OSLibName = "freebsd"; - else if (Triple.isOSBinFormatWasm()) - OSLibName = "wasm"; - else - OSLibName = getOS(); - llvm::sys::path::append(Path, "lib", OSLibName); + if (Triple.isOSUnknown()) { + llvm::sys::path::append(Path, "lib"); + } else { + StringRef OSLibName = Triple.isOSFreeBSD() ? "freebsd" : getOS(); + llvm::sys::path::append(Path, "lib", OSLibName); + } return Path.str(); } |
