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

Subject: [Boost-commit] svn:boost r77201 - trunk/tools/build/v2/tools
From: oliver.kowalke_at_[hidden]
Date: 2012-03-04 05:11:01

Author: olli
Date: 2012-03-04 05:11:00 EST (Sun, 04 Mar 2012)
New Revision: 77201
URL: http://svn.boost.org/trac/boost/changeset/77201

Log:
tools: remove default 'i386' for architecture on x86

Text files modified: 
   trunk/tools/build/v2/tools/gcc.jam |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 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-04 05:11:00 EST (Sun, 04 Mar 2012)
@@ -1097,9 +1097,10 @@
 #
 # x86 and compatible
 # The 'native' option appeared in gcc 4.2 so we cannot safely use it
-# as default. Use conservative i386 instead.
+# as default. Don't use i386 instead otherwise you get combinations like
+# -march=i386 -m64.
 cpu-flags gcc OPTIONS : x86 : native : -march=native ;
-cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 : default ;
+cpu-flags gcc OPTIONS : x86 : i386 : -march=i386 ;
 cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
 cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
 cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;