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

Subject: [Boost-commit] svn:boost r49990 - trunk/tools/jam/src
From: grafikrobot_at_[hidden]
Date: 2008-11-28 11:25:56

Author: grafik
Date: 2008-11-28 11:25:56 EST (Fri, 28 Nov 2008)
New Revision: 49990
URL: http://svn.boost.org/trac/boost/changeset/49990

Log:
Fix compiling with vacpp on non-AIX systems. (fixes #2546)
Text files modified: 
   trunk/tools/jam/src/build.jam |    11 +++++++++--                             
   1 files changed, 9 insertions(+), 2 deletions(-)

Modified: trunk/tools/jam/src/build.jam
==============================================================================
--- trunk/tools/jam/src/build.jam	(original)
+++ trunk/tools/jam/src/build.jam	2008-11-28 11:25:56 EST (Fri, 28 Nov 2008)
@@ -132,6 +132,7 @@
 # commands and options to compile the full Jam. When
 # adding new toolsets make sure to add them to the
 # "known" list also.
+
 rule toolset ( name command .type ? : opt.out + : opt.define * : flags * : linklibs * )
 {
     .type ?= "" ;
@@ -142,7 +143,13 @@
     tool.$(name)$(.type).linklibs ?= $(linklibs) ;
     if ! $(name) in $(toolsets) { toolsets += $(name) ; }
 }
-rule opt ( type : yes-opt * : no-opt * ) { if $(type) in $(ARGV) { return $(yes-opt) ; } else { return $(no-opt) ; } }
+
+rule if-os ( os + : yes-opt * : no-opt * )
+    { if $(os) in $(OS) { return $(yes-opt) ; } else { return $(no-opt) ; } }
+
+rule opt ( type : yes-opt * : no-opt * )
+    { if $(type) in $(ARGV) { return $(yes-opt) ; } else { return $(no-opt) ; } }
+
 ## HP-UX aCC compiler
 toolset acc cc : "-o " : -D
     : -Ae
@@ -307,7 +314,7 @@
     [ opt --release : -s -O3 -qstrict -qinline ]
     [ opt --debug : -g -qNOOPTimize -qnoinline -pg ]
     -I$(--python-include) -I$(--extra-include)
-    : -L$(--python-lib[1]) -l$(--python-lib[2]) -bmaxdata:0x40000000 ;
+    : -L$(--python-lib[1]) -l$(--python-lib[2]) [ if-os AIX : -bmaxdata:0x40000000 ] ;
 ## Microsoft Visual C++ .NET 7.x
 toolset vc7 cl : /Fe /Fe /Fd /Fo : -D
     : /nologo