From 4cd98aa8adb3c9801b4836b83c97bdb2381ea792 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Thu, 22 Oct 2009 08:23:41 +0000
Subject: [PATCH] Don't pass -m64 if address-model is 32_64 (or anything !=
 64).

[SVN r57061]
---
 src/tools/gcc.jam | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index 8350e592d..21b265d8a 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -373,10 +373,12 @@ rule setup-address-model ( targets * : sources * : properties * )
             {
                 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) ;
     }