From b3c66209bf24e5f6f9f1b69f009eb9effbf20143 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 9 Nov 2009 02:13:02 +0000
Subject: [PATCH] Fix references to non-existent rules that caused building to
 fail. And fix building with iPhone as it uses a symbolic version number, not
 jsut numeric.

[SVN r57500]
---
 src/tools/darwin.jam | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/tools/darwin.jam b/src/tools/darwin.jam
index d8437c7b9..9569f73b3 100644
--- a/src/tools/darwin.jam
+++ b/src/tools/darwin.jam
@@ -3,7 +3,7 @@
 # Copyright 2003, 2004, 2005, 2006 Vladimir Prus 
 # Copyright 2005-2007 Mat Marcus
 # Copyright 2005-2007 Adobe Systems Incorporated
-# Copyright 2007-2008 Rene Rivera
+# Copyright 2007-2009 Rene Rivera
 # Distributed under the Boost Software License, Version 1.0. 
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
@@ -319,14 +319,22 @@ rule setup-address-model ( targets * : sources * : properties * )
     
     osx-version ?= $(.host-osx-version) ;
 
-    if $(osx-version) && ! [ version.version-less [ regex.split $(osx-version) \\. ] : 10 6 ]
+    switch $(osx-version)
     {
-        # When targeting 10.6:
-        # - gcc 4.2 will give a compiler errir if ppc64 compilation is requested
-        # - gcc 4.0 will compile fine, somehow, but then fail at link time
-        support-ppc64 = ;
+        case iphone* :
+        {
+            support-ppc64 = ;
+        }
+        
+        case * :
+        if $(osx-version) && ! [ version.version-less [ regex.split $(osx-version) \\. ] : 10 6 ]
+        {
+            # When targeting 10.6:
+            # - gcc 4.2 will give a compiler errir if ppc64 compilation is requested
+            # - gcc 4.0 will compile fine, somehow, but then fail at link time
+            support-ppc64 = ;
+        }
     }
-           
     switch $(arch)
     {
         case combined : 
@@ -403,7 +411,7 @@ rule compile.m ( targets * : sources * : properties * )
 {
     LANG on $(<) = "-x objective-c" ;
     gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    setup-arch-addr-flags $(targets) : $(sources) : $(properties) ;
+    setup-address-model $(targets) : $(sources) : $(properties) ;
 }
 
 actions compile.m
@@ -415,7 +423,7 @@ rule compile.mm  ( targets * : sources * : properties * )
 {
     LANG on $(<) = "-x objective-c++" ;
     gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    setup-arch-addr-flags $(targets) : $(sources) : $(properties) ;
+    setup-address-model $(targets) : $(sources) : $(properties) ;
 }
 
 actions compile.mm