diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-01-13 21:33:06 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-01-13 21:33:06 +0000 |
| commit | 31cbe684302a5ccb001fa2131c0e4aeaa372f5c0 (patch) | |
| tree | 3b6780d2ccc7e433e62e1f80237dc1200c62b8f2 /lib | |
| parent | e4c7f90da208ed2caeab784b32f416a50eed8da3 (diff) | |
Revert r148138; it's causing test failures.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148141 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Basic/Targets.cpp | 2 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 47598f8152..b6c07567a9 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -148,7 +148,7 @@ static void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts, } } - // If -target arch-pc-win32-macho option specified, we're + // If -ccc-host-triple arch-pc-win32-macho option specified, we're // generating code for Win32 ABI. No need to emit // __ENVIRONMENT_XX_OS_VERSION_MIN_REQUIRED__. if (PlatformName == "win32") { diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 19ed16c9d5..ce4a89e724 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -305,7 +305,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { } // FIXME: We shouldn't overwrite the default host triple here, but we have // nowhere else to put this currently. - if (const Arg *A = Args->getLastArg(options::OPT_target)) + if (const Arg *A = Args->getLastArg(options::OPT_ccc_host_triple)) DefaultTargetTriple = A->getValue(*Args); if (const Arg *A = Args->getLastArg(options::OPT_ccc_install_dir)) Dir = InstalledDir = A->getValue(*Args); |