Opened 16 years ago

Closed 15 years ago

#798 closed Patches (fixed)

bjam: always define OSPLAT

Reported by: nobody Owned by: René Rivera
Milestone: Boost.Jam 3.1.15 Component: bjam
Version: None Severity: Problem
Keywords: Cc:

Description (last modified by René Rivera)

Please patch boost/tools/jam/src/jam.h so that OSPLAT is always defined. Note that I don't know if I should have removed "!defined( OS_AS400 )" in the X86 section.

$ cvs diff -c jam.h
Index: jam.h
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/jam.h,v
retrieving revision 1.21
diff -c -r1.21 jam.h
*** jam.h	7 Sep 2006 03:57:02 -0000	1.21
--- jam.h	20 Dec 2006 22:34:30 -0000
***************
*** 447,476 ****
       defined( __alpha__ )
  # define OSPLAT "OSPLAT=AXP"
  # endif
! 
  # 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 
  
  # 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"
--- 447,472 ----
       defined( __alpha__ )
  # define OSPLAT "OSPLAT=AXP"
  # endif
!   
  # if defined( _i386_ ) || \
       defined( __i386__ ) || \
       defined( _M_IX86 )
  # define OSPLAT "OSPLAT=X86"
  # endif 
  
+ # if defined( __x86_64__ ) || \
+      defined( __amd64__ )  || \
+      defined( _M_AMD64 )
+ # define OSPLAT "OSPLAT=X86_64"
+ # endif
+ 
  # ifdef __sparc__
  # define OSPLAT "OSPLAT=SPARC"
  # endif
  
  # ifdef __mips__
  # define OSPLAT "OSPLAT=MIPS"
  # endif
  
  # ifdef __arm__
  # define OSPLAT "OSPLAT=ARM"

Change History (4)

comment:1 by mclow, 16 years ago

Logged In: YES 
user_id=131412
Originator: NO

Rene - let me know if you're not the right person for this - thanks!

comment:2 by René Rivera, 15 years ago

Component: Nonebjam

comment:3 by René Rivera, 15 years ago

Description: modified (diff)
Milestone: Boost.Jam 3.1.15
Severity: Problem

comment:4 by René Rivera, 15 years ago

Resolution: Nonefixed
Status: assignedclosed

(In [39331]) Define OSPLAT var unconditionally, and more generically, when possible. (fixes #798)

Note: See TracTickets for help on using tickets.