[cfe-commits] r156497 - in /cfe/trunk/lib/Driver: ToolChains.cpp ToolChains.h

[Chad Rosier]

Author: mcrosier
Date: Wed May  9 13:37:26 2012
New Revision: 156497

URL: http://llvm.org/viewvc/llvm-project?rev=156497&view=rev
Log:
Move the iOSVersionMin string to a header so as to avoid a dangling pointer.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/lib/Driver/ToolChains.h

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=156497&r1=156496&r2=156497&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Wed May  9 13:37:26 2012
@@ -525,7 +525,6 @@
     // go ahead as assume we're targeting iOS.
     if (OSXTarget.empty() && iOSTarget.empty())
       if (getDarwinArchName(Args) == "armv7") {
-        std::string iOSVersionMin;
         unsigned Major, Minor, Micro;
         getTriple().getiOSVersion(Major, Minor, Micro);
         llvm::raw_string_ostream(iOSVersionMin)

Modified: cfe/trunk/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.h?rev=156497&r1=156496&r2=156497&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.h (original)
+++ cfe/trunk/lib/Driver/ToolChains.h Wed May  9 13:37:26 2012
@@ -205,6 +205,10 @@
   /// initialized.
   std::string MacosxVersionMin;
 
+  /// The default ios-version-min of this tool chain; empty until
+  /// initialized.
+  std::string iOSVersionMin;
+
   bool hasARCRuntime() const;
   bool hasSubscriptingRuntime() const;