[Boost-commit] svn:boost r57546 - in branches/release/tools/build/v2: . tools

Subject: [Boost-commit] svn:boost r57546 - in branches/release/tools/build/v2: . tools
From: ghost_at_[hidden]
Date: 2009-11-10 12:27:00

Author: vladimir_prus
Date: 2009-11-10 12:26:59 EST (Tue, 10 Nov 2009)
New Revision: 57546
URL: http://svn.boost.org/trac/boost/changeset/57546

Log:
Merge: Fix generating invalid feature values for OSX version to target.
Properties modified: 
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/tools/darwin.jam |    12 ++++++++----                            
   1 files changed, 8 insertions(+), 4 deletions(-)

Modified: branches/release/tools/build/v2/tools/darwin.jam
==============================================================================
--- branches/release/tools/build/v2/tools/darwin.jam	(original)
+++ branches/release/tools/build/v2/tools/darwin.jam	2009-11-10 12:26:59 EST (Tue, 10 Nov 2009)
@@ -232,10 +232,6 @@
         local sdk-match = [ MATCH ([^0-9]+)([0-9]+)[.]([0-9x]+)[.]?([0-9x]+)? : $(sdk:D=) ] ;
         local sdk-platform = $(sdk-match[1]:L) ;
         local sdk-version = $(sdk-match[2]).$(sdk-match[3]) ;
-        if $(sdk-match[4])
-        {
-            sdk-version = $(sdk-version).$(sdk-match[4]) ;
-        }
         if $(sdk-version)
         {
             switch $(sdk-platform)
@@ -246,10 +242,18 @@
                 }
                 case iphoneos :
                 {
+                    if $(sdk-match[4])
+                    {
+                        sdk-version = $(sdk-version).$(sdk-match[4]) ;
+                    }
                     sdk-version = iphone-$(sdk-version) ;
                 }
                 case iphonesimulator :
                 {
+                    if $(sdk-match[4])
+                    {
+                        sdk-version = $(sdk-version).$(sdk-match[4]) ;
+                    }
                     sdk-version = iphonesim-$(sdk-version) ;
                 }
                 case * :