[cfe-commits] r156498 - /cfe/trunk/lib/Driver/ToolChains.cpp

[David Blaikie]

On Wed, May 9, 2012 at 11:46 AM, Chad Rosier <mcrosier at apple.com> wrote:
> Author: mcrosier
> Date: Wed May  9 13:46:30 2012
> New Revision: 156498
>
> URL: http://llvm.org/viewvc/llvm-project?rev=156498&view=rev
> Log:
> Now the proper fix for r156497.  Sorry for the churn.
>
> Modified:
>    cfe/trunk/lib/Driver/ToolChains.cpp
>
> Modified: cfe/trunk/lib/Driver/ToolChains.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=156498&r1=156497&r2=156498&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/ToolChains.cpp (original)
> +++ cfe/trunk/lib/Driver/ToolChains.cpp Wed May  9 13:46:30 2012
> @@ -59,6 +59,11 @@
>   DarwinVersion[0] = Minor + 4;
>   DarwinVersion[1] = Micro;
>   DarwinVersion[2] = 0;
> +
> +  // Compute the initial iOS version from the triple
> +  getTriple().getiOSVersion(Major, Minor, Micro);
> +  llvm::raw_string_ostream(iOSVersionMin)
> +    << Major << '.' << Minor << '.' << Micro;
>  }
>
>  types::ID Darwin::LookupTypeForExtension(const char *Ext) const {
> @@ -525,10 +530,6 @@
>     // go ahead as assume we're targeting iOS.
>     if (OSXTarget.empty() && iOSTarget.empty())
>       if (getDarwinArchName(Args) == "armv7") {

Side note: you could roll these conditions into a single 'if', it seems.

> -        unsigned Major, Minor, Micro;
> -        getTriple().getiOSVersion(Major, Minor, Micro);
> -        llvm::raw_string_ostream(iOSVersionMin)
> -          << Major << '.' << Minor << '.' << Micro;
>         iOSTarget = iOSVersionMin;
>       }
>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits