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

Subject: [Boost-commit] svn:boost r57061 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2009-10-22 04:23:43

Author: vladimir_prus
Date: 2009-10-22 04:23:41 EDT (Thu, 22 Oct 2009)
New Revision: 57061
URL: http://svn.boost.org/trac/boost/changeset/57061

Log:
Don't pass -m64 if address-model is 32_64 (or anything != 64).

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

Modified: trunk/tools/build/v2/tools/gcc.jam
==============================================================================
--- trunk/tools/build/v2/tools/gcc.jam	(original)
+++ trunk/tools/build/v2/tools/gcc.jam	2009-10-22 04:23:41 EDT (Thu, 22 Oct 2009)
@@ -373,10 +373,12 @@
             {
                 option = -m32 ;
             }
-            else
+            else if $(model) = 64
             {
                 option = -m64 ;
             }
+            # For darwin, the model can be 32_64. darwin.jam will handle that
+            # on its own.
         }
         OPTIONS on $(targets) += $(option) ;
     }