maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[driver][macOS] Pick the system version for the deployment target 

if the SDK is newer than the system

This commit improves the driver by making sure that it picks the system version
for the deployment target when the version of the macOS SDK is newer than the
system version.

rdar://29449467

Differential Revision: https://reviews.llvm.org/D34175

llvm-svn: 305678
This commit is contained in:
Alex Lorenz 2017-06-19 10:57:27 +00:00
parent ee1b096f8a
commit dad1e1a3b5
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clang/lib/Driver/ToolChains/Darwin.cpp
View File

@ -1118,6 +1118,25 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args,
}
}
/// Returns the most appropriate macOS target version for the current process.
///
/// If the macOS SDK version is the same or earlier than the system version,
/// then the SDK version is returned. Otherwise the system version is returned.
static std::string getSystemOrSDKMacOSVersion(StringRef MacOSSDKVersion) {
unsigned Major, Minor, Micro;
llvm::Triple(llvm::sys::getProcessTriple())
.getMacOSXVersion(Major, Minor, Micro);
VersionTuple SystemVersion(Major, Minor, Micro);
bool HadExtra;
if (!Driver::GetReleaseVersion(MacOSSDKVersion, Major, Minor, Micro,
HadExtra))
return MacOSSDKVersion;
VersionTuple SDKVersion(Major, Minor, Micro);
if (SDKVersion > SystemVersion)
return SystemVersion.getAsString();
return MacOSSDKVersion;
}
void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
const OptTable &Opts = getDriver().getOpts();
@ -1210,7 +1229,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
SDK.startswith("iPhoneSimulator"))
iOSTarget = Version;
else if (SDK.startswith("MacOSX"))
OSXTarget = Version;
OSXTarget = getSystemOrSDKMacOSVersion(Version);
else if (SDK.startswith("WatchOS") ||
SDK.startswith("WatchSimulator"))
WatchOSTarget = Version;

9
clang/test/Driver/darwin-sdkroot.c
View File

@ -74,3 +74,12 @@
// CHECK-MACOSX: "-triple" "x86_64-apple-macosx10.10.0"
// CHECK-MACOSX: ld
// CHECK-MACOSX: "-macosx_version_min" "10.10.0"
// Ensure that we never pick a version that's based on the SDK that's newer than
// the system version:
// RUN: rm -rf %t/SDKs/MacOSX10.99.99.sdk
// RUN: mkdir -p %t/SDKs/MacOSX10.99.99.sdk
// RUN: %clang -target x86_64-apple-darwin -isysroot %t/SDKs/MacOSX10.99.99.sdk %s -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-MACOSX-SYSTEM-VERSION %s
// CHECK-MACOSX-SYSTEM-VERSION-NOT: 10.99.99"