Index: lib/Driver/Driver.cpp
===================================================================
--- lib/Driver/Driver.cpp
+++ lib/Driver/Driver.cpp
@@ -2248,6 +2248,7 @@
         TC = new toolchains::Generic_GCC(*this, Target, Args);
       break;
     }
+    ToolChains[Target.str()] = TC;
   }
   return *TC;
 }