From 238228890543beaec87deeb4f30664647bdaa307 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 10 Nov 2009 17:20:51 +0000 Subject: [PATCH] Fix generating invalid feature values for OSX version to target. [SVN r57545] --- src/tools/darwin.jam | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tools/darwin.jam b/src/tools/darwin.jam index 9569f73b3..37bfbf88c 100644 --- a/src/tools/darwin.jam +++ b/src/tools/darwin.jam @@ -232,10 +232,6 @@ local rule init-available-sdk-versions ( condition * : root ? ) 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 @@ local rule init-available-sdk-versions ( condition * : root ? ) } 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 * :