Remove GetSystemLibraryPaths.

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

diff --git a/lib/Support/Unix/Host.inc b/lib/Support/Unix/Host.inc
index 0f3e31a41b92acd3b5f0e5496fbfad07c532b21d..726e2fbcf056686f41533547a670a90bafcde7c6 100644 (file)
--- a/lib/Support/Unix/Host.inc
+++ b/lib/Support/Unix/Host.inc
@@ -29,25 +29,17 @@ using namespace llvm;
 static std::string getOSVersion() {
   struct utsname info;
 
-  // Recognize UNAME_RELEASE environment variable to match Darwin uname.
-  const char *UnameOverride = ::getenv("UNAME_RELEASE");
-  if (UnameOverride && UnameOverride[0] != '\0')
-    return UnameOverride;
-
   if (uname(&info))
     return "";
 
   return info.release;
 }
 
-std::string sys::getHostTriple() {
-  // FIXME: Derive directly instead of relying on the autoconf generated
-  // variable.
-
-  StringRef HostTripleString(LLVM_HOSTTRIPLE);
-  std::pair<StringRef, StringRef> ArchSplit = HostTripleString.split('-');
+std::string sys::getDefaultTargetTriple() {
+  StringRef TargetTripleString(LLVM_DEFAULT_TARGET_TRIPLE);
+  std::pair<StringRef, StringRef> ArchSplit = TargetTripleString.split('-');
 
-  // Normalize the arch, since the host triple may not actually match the host.
+  // Normalize the arch, since the target triple may not actually match the target.
   std::string Arch = ArchSplit.first;
 
   std::string Triple(Arch);
@@ -60,7 +52,7 @@ std::string sys::getHostTriple() {
     Triple[1] = '3';
 
   // On darwin, we want to update the version to match that of the
-  // host.
+  // target.
   std::string::size_type DarwinDashIdx = Triple.find("-darwin");
   if (DarwinDashIdx != std::string::npos) {
     Triple.resize(DarwinDashIdx + strlen("-darwin"));