diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-25 12:25:39 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-25 12:25:39 -0800 |
| commit | 2a5c6e40d0a9d279750f84a3678c3e4d23061301 (patch) | |
| tree | 7714a0b54ab9b3fb492b0c79505671b1310ff8d8 /lib/Driver/Driver.cpp | |
| parent | ec1178a11d6dbeb371f45dd94a1d1c0849bbf1cb (diff) | |
| parent | 632c823b8bfd3fd5a4b77628eddd6161c5d8367e (diff) | |
Merge branch 'master' of github.com:sunfishcode/emscripten-fastcomp-clang into incoming
Diffstat (limited to 'lib/Driver/Driver.cpp')
| -rw-r--r-- | lib/Driver/Driver.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 1dbbc9a342..6d0ac5733a 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1759,6 +1759,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args, case llvm::Triple::Win32: TC = new toolchains::Windows(*this, Target, Args); break; + case llvm::Triple::Emscripten: + TC = new toolchains::EmscriptenToolChain(*this, Target, Args); + break; case llvm::Triple::MinGW32: // FIXME: We need a MinGW toolchain. Fallthrough for now. default: |