diff options
| author | Frederic Riss <friss@apple.com> | 2016-01-12 23:47:59 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2016-01-12 23:47:59 +0000 |
| commit | 3ad83bd3845a84f54af7a2dadff4473a2bbc642f (patch) | |
| tree | c410fa9afb3b63e80c9c685404d5ec649ba6fc3e | |
| parent | db7824f0c1e5fc230faedb2869bc6033fe213500 (diff) | |
| download | bcm5719-llvm-3ad83bd3845a84f54af7a2dadff4473a2bbc642f.tar.gz bcm5719-llvm-3ad83bd3845a84f54af7a2dadff4473a2bbc642f.zip | |
[Darwin] Fix deployment target detection
There was a thinko in the deployment target detection code that
made the -isysroot parsing have precedence over the environment
variable for tvOS. This patch makes this logic symetric for all
platforms (the env variable must have precedence).
llvm-svn: 257543
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/appletvos-version-min.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index b9768a42fdf..beede2e0580 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -526,7 +526,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const { // no environment variable defined, see if we can set the default based // on -isysroot. if (OSXTarget.empty() && iOSTarget.empty() && WatchOSTarget.empty() && - Args.hasArg(options::OPT_isysroot)) { + TvOSTarget.empty() && Args.hasArg(options::OPT_isysroot)) { if (const Arg *A = Args.getLastArg(options::OPT_isysroot)) { StringRef isysroot = A->getValue(); // Assume SDK has path: SOME_PATH/SDKs/PlatformXX.YY.sdk diff --git a/clang/test/Driver/appletvos-version-min.c b/clang/test/Driver/appletvos-version-min.c index 9ff8297fe9e..7cbb2001a3e 100644 --- a/clang/test/Driver/appletvos-version-min.c +++ b/clang/test/Driver/appletvos-version-min.c @@ -2,6 +2,7 @@ // REQUIRES: aarch64-registered-target // RUN: %clang -target i386-apple-darwin10 -mappletvsimulator-version-min=9.0 -arch x86_64 -S -o - %s | FileCheck %s // RUN: %clang -target armv7s-apple-darwin10 -mappletvos-version-min=9.0 -arch arm64 -S -o - %s | FileCheck %s +// RUN: env TVOS_DEPLOYMENT_TARGET=9.0 %clang -isysroot SDKs/MacOSX10.9.sdk -target i386-apple-darwin10 -arch x86_64 -S -o - %s | FileCheck %s int main() { return 0; } // CHECK: .tvos_version_min 9, 0 |
