rename LLVM_HOSTTRIPLE into LLVM_DEFAULT_TARGET_TRIPLE

[oota-llvm.git] / lib / Support / Unix / Host.inc

diff --git a/lib/Support/Unix/Host.inc b/lib/Support/Unix/Host.inc
index 744fb9e699699a53b67aebb4a0b0c467ce1b97e7..dc1641722b1d226392df003ebf1c6a04f33d93f9 100644 (file)
--- a/lib/Support/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -29,13 +29,6 @@ using namespace llvm;
 static std::string getOSVersion() {
   struct utsname info;
 
-#ifdef __APPLE__
-  // Recognize UNAME_RELEASE environment variable to match Darwin uname.
-  const char *UnameOverride = ::getenv("UNAME_RELEASE");
-  if (UnameOverride && UnameOverride[0] != '\0')
-    return UnameOverride;
-#endif // __APPLE__
-
   if (uname(&info))
     return "";
 
@@ -43,10 +36,7 @@ static std::string getOSVersion() {
 }
 
 std::string sys::getHostTriple() {
-  // FIXME: Derive directly instead of relying on the autoconf generated
-  // variable.
-
-  StringRef HostTripleString(LLVM_HOSTTRIPLE);
+  StringRef HostTripleString(LLVM_DEFAULT_TARGET_TRIPLE);
   std::pair<StringRef, StringRef> ArchSplit = HostTripleString.split('-');
 
   // Normalize the arch, since the host triple may not actually match the host.