From edd6e09207dc69d9f8cf686e44e8bce497447b34 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 1 Jun 2015 23:38:25 +0000 Subject: [PATCH] [Basic] Transition getEnvironmentVersion from getOSVersion for android 'android' occupies the environment component of the triple. Let's use getEnvironmentVersion to extract it instead of getOSVersion. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@238797 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 0eb5cee351..f70d588ec0 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -389,7 +389,7 @@ protected: if (Triple.getEnvironment() == llvm::Triple::Android) { Builder.defineMacro("__ANDROID__", "1"); unsigned Maj, Min, Rev; - Triple.getOSVersion(Maj, Min, Rev); + Triple.getEnvironmentVersion(Maj, Min, Rev); this->PlatformName = "android"; this->PlatformMinVersion = VersionTuple(Maj, Min, Rev); } -- 2.50.1