[Boost-commit] svn:boost r50172 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r50172 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2008-12-07 03:25:42

Author: vladimir_prus
Date: 2008-12-07 03:25:41 EST (Sun, 07 Dec 2008)
New Revision: 50172
URL: http://svn.boost.org/trac/boost/changeset/50172

Log:
Support for 32+64 fat binaries on Darwin.

Fixes #1679.

Text files modified: 
   trunk/tools/build/v2/tools/builtin.jam |     2 +-                                      
   trunk/tools/build/v2/tools/darwin.jam  |     3 +++                                     
   2 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/tools/builtin.jam
==============================================================================
--- trunk/tools/build/v2/tools/builtin.jam	(original)
+++ trunk/tools/build/v2/tools/builtin.jam	2008-12-07 03:25:41 EST (Sun, 07 Dec 2008)
@@ -219,7 +219,7 @@
 
 # The addressing model to generate code for. Currently a limited set only
 # specifying the bit size of pointers.
-feature.feature address-model : 16 32 64 : propagated optional ;
+feature.feature address-model : 16 32 64 32_64 : propagated optional ;
 
 # Type of CPU architecture to compile for.
 feature.feature architecture :

Modified: trunk/tools/build/v2/tools/darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/darwin.jam	(original)
+++ trunk/tools/build/v2/tools/darwin.jam	2008-12-07 03:25:41 EST (Sun, 07 Dec 2008)
@@ -302,12 +302,15 @@
 
 arch-addr-flags darwin OPTIONS : combined : 32 : -arch i386 -arch ppc : default ;
 arch-addr-flags darwin OPTIONS : combined : 64 : -arch x86_64 -arch ppc64 ;
+arch-addr-flags darwin OPTIONS : combined : 32_64 : -arch i386 -arch ppc -arch x86_64 -arch ppc64 ;
 
 arch-addr-flags darwin OPTIONS : x86 : 32 : -arch i386 : default ;
 arch-addr-flags darwin OPTIONS : x86 : 64 : -arch x86_64 ;
+arch-addr-flags darwin OPTIONS : x86 : 32_64 : -arch i386 -arch x86_64 ;
 
 arch-addr-flags darwin OPTIONS : power : 32 : -arch ppc : default ;
 arch-addr-flags darwin OPTIONS : power : 64 : -arch ppc64 ;
+arch-addr-flags darwin OPTIONS : power : 32_64 : -arch ppc -arch ppc64 ;
 
 arch-addr-flags darwin OPTIONS : arm : 32 : -arch arm : default ;