diff options
| -rw-r--r-- | lib/ARCMigrate/ARCMT.cpp | 5 | ||||
| -rw-r--r-- | test/ARCMT/assign-prop-with-arc-runtime.m | 2 | ||||
| -rw-r--r-- | test/ARCMT/assign-prop-with-arc-runtime.m.result | 2 | ||||
| -rw-r--r-- | test/ARCMT/rewrite-block-var.m | 2 | ||||
| -rw-r--r-- | test/ARCMT/rewrite-block-var.m.result | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp index bb66da6a71..98e593c0fa 100644 --- a/lib/ARCMigrate/ARCMT.cpp +++ b/lib/ARCMigrate/ARCMT.cpp @@ -125,6 +125,11 @@ CompilerInvocation *createInvocationForMigration(CompilerInvocation &origCI) { llvm::Triple triple(CInvok->getTargetOpts().Triple); if (triple.getOS() == llvm::Triple::IOS || triple.getOS() == llvm::Triple::MacOSX) { + args.push_back("-ccc-host-triple"); + std::string forcedTriple = triple.getArchName(); + forcedTriple += "-apple-darwin10"; + args.push_back(forcedTriple); + unsigned Major, Minor, Micro; triple.getOSVersion(Major, Minor, Micro); llvm::SmallString<100> flag; diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m b/test/ARCMT/assign-prop-with-arc-runtime.m index b77b61ba46..49c25a7a62 100644 --- a/test/ARCMT/assign-prop-with-arc-runtime.m +++ b/test/ARCMT/assign-prop-with-arc-runtime.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/test/ARCMT/assign-prop-with-arc-runtime.m.result b/test/ARCMT/assign-prop-with-arc-runtime.m.result index c5e5854e9a..88b41de5b6 100644 --- a/test/ARCMT/assign-prop-with-arc-runtime.m.result +++ b/test/ARCMT/assign-prop-with-arc-runtime.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fsyntax-only %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/test/ARCMT/rewrite-block-var.m b/test/ARCMT/rewrite-block-var.m index 76f5d5092b..8053cfe773 100644 --- a/test/ARCMT/rewrite-block-var.m +++ b/test/ARCMT/rewrite-block-var.m @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" diff --git a/test/ARCMT/rewrite-block-var.m.result b/test/ARCMT/rewrite-block-var.m.result index ac220ad2a7..a2fa56d784 100644 --- a/test/ARCMT/rewrite-block-var.m.result +++ b/test/ARCMT/rewrite-block-var.m.result @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fblocks -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-macosx10.8 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fobjc-nonfragile-abi -fblocks -fsyntax-only %s > %t // RUN: diff %t %s.result #include "Common.h" |