<div dir="ltr">We should fix cmake/Modules/GetHostTriple.cmake to return the canonical triple.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Mar 28, 2014 at 6:08 PM, Saleem Abdulrasool <span dir="ltr"><<a href="mailto:compnerd@compnerd.org" target="_blank">compnerd@compnerd.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Fri Mar 28 20:08:53 2014<br>
New Revision: 205070<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=205070&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=205070&view=rev</a><br>
Log:<br>
Windows: canonicalise the default windows triple<br>
<br>
Canonicalise the default triple that is used on Windows.  This should hopefully<br>
fix the MSVC buildbots.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Support/Windows/Host.inc<br>
    llvm/trunk/tools/llvm-config/llvm-config.cpp<br>
<br>
Modified: llvm/trunk/lib/Support/Windows/Host.inc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Host.inc?rev=205070&r1=205069&r2=205070&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Host.inc?rev=205070&r1=205069&r2=205070&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Support/Windows/Host.inc (original)<br>
+++ llvm/trunk/lib/Support/Windows/Host.inc Fri Mar 28 20:08:53 2014<br>
@@ -18,5 +18,5 @@<br>
 using namespace llvm;<br>
<br>
 std::string sys::getDefaultTargetTriple() {<br>
-  return LLVM_DEFAULT_TARGET_TRIPLE;<br>
+  return Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE);<br>
 }<br>
<br>
Modified: llvm/trunk/tools/llvm-config/llvm-config.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.cpp?rev=205070&r1=205069&r2=205070&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.cpp?rev=205070&r1=205069&r2=205070&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/tools/llvm-config/llvm-config.cpp (original)<br>
+++ llvm/trunk/tools/llvm-config/llvm-config.cpp Fri Mar 28 20:08:53 2014<br>
@@ -20,6 +20,7 @@<br>
 #include "llvm/ADT/STLExtras.h"<br>
 #include "llvm/ADT/StringMap.h"<br>
 #include "llvm/ADT/StringRef.h"<br>
+#include "llvm/ADT/Triple.h"<br>
 #include "llvm/ADT/Twine.h"<br>
 #include "llvm/Config/config.h"<br>
 #include "llvm/Config/llvm-config.h"<br>
@@ -311,7 +312,7 @@ int main(int argc, char **argv) {<br>
       } else if (Arg == "--targets-built") {<br>
         OS << LLVM_TARGETS_BUILT << '\n';<br>
       } else if (Arg == "--host-target") {<br>
-        OS << LLVM_DEFAULT_TARGET_TRIPLE << '\n';<br>
+        OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';<br>
       } else if (Arg == "--build-mode") {<br>
         OS << build_mode << '\n';<br>
       } else if (Arg == "--assertion-mode") {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>