[Boost-commit] svn:boost r39331 - trunk/tools/jam/src

From: grafikrobot_at_[hidden]
Date: 2007-09-16 17:55:03

Author: grafik
Date: 2007-09-16 17:55:02 EDT (Sun, 16 Sep 2007)
New Revision: 39331
URL: http://svn.boost.org/trac/boost/changeset/39331

Log:
Define OSPLAT var unconditionally, and more generically, when possible. (fixes #798)
Text files modified: 
   trunk/tools/jam/src/jam.h |    26 ++++++++++++--------------              
   1 files changed, 12 insertions(+), 14 deletions(-)

Modified: trunk/tools/jam/src/jam.h
==============================================================================
--- trunk/tools/jam/src/jam.h	(original)
+++ trunk/tools/jam/src/jam.h	2007-09-16 17:55:02 EDT (Sun, 16 Sep 2007)
@@ -452,35 +452,33 @@
 # if defined( _i386_ ) || \
      defined( __i386__ ) || \
      defined( _M_IX86 )
-# if !defined( OS_FREEBSD ) && \
-     !defined( OS_DRAGONFLYBSD ) && \
-     !defined( OS_OS2 ) && \
-     !defined( OS_AS400 )
 # define OSPLAT "OSPLAT=X86"
-# endif
 # endif 
 
+# if defined( __ia64__ ) || defined( __IA64__ )
+# define OSPLAT "OSPLAT=IA64"
+# endif
+
+# if \
+    defined( __x86_64__ ) || \
+    defined( __amd64__ ) || \
+    defined( _M_AMD64 )
+# define OSPLAT "OSPLAT=X86_64"
+# endif
+
+
 # ifdef __sparc__
-# if !defined( OS_SUNOS ) && \
-     !defined( OS_SOLARIS )
 # define OSPLAT "OSPLAT=SPARC"
 # endif
-# endif
 
 # ifdef __mips__
-# if !defined( OS_SGI )
 # define OSPLAT "OSPLAT=MIPS"
 # endif
-# endif
 
 # ifdef __arm__
 # define OSPLAT "OSPLAT=ARM"
 # endif
 
-# if defined( __ia64__ ) || defined( __IA64__ )
-# define OSPLAT "OSPLAT=IA64"
-# endif
-
 # ifdef __s390__
 # define OSPLAT "OSPLAT=390"
 # endif