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

Subject: [Boost-commit] svn:boost r77275 - trunk/tools/build/v2/tools
From: steven_at_[hidden]
Date: 2012-03-08 15:51:37

Author: steven_watanabe
Date: 2012-03-08 15:51:37 EST (Thu, 08 Mar 2012)
New Revision: 77275
URL: http://svn.boost.org/trac/boost/changeset/77275

Log:
Don't use -m32 on arm.  This is a more correct version of r77216.
Text files modified: 
   trunk/tools/build/v2/tools/gcc.jam |    16 ++++++++++------                        
   1 files changed, 10 insertions(+), 6 deletions(-)

Modified: trunk/tools/build/v2/tools/gcc.jam
==============================================================================
--- trunk/tools/build/v2/tools/gcc.jam	(original)
+++ trunk/tools/build/v2/tools/gcc.jam	2012-03-08 15:51:37 EST (Thu, 08 Mar 2012)
@@ -446,13 +446,17 @@
         }
         else
         {
-            if $(model) = 32
+            local arch = [ feature.get-values architecture : $(properties) ] ;
+            if $(arch) != arm
             {
-                option = -m32 ;
-            }
-            else if $(model) = 64
-            {
-                option = -m64 ;
+                if $(model) = 32
+                {
+                    option = -m32 ;
+                }
+                else if $(model) = 64
+                {
+                    option = -m64 ;
+                }
             }
             # For darwin, the model can be 32_64. darwin.jam will handle that
             # on its own.