Patch for vacpp-tools.jam

From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2003-02-14 08:46:16

Hello,

any objections to applying the attached patch to vacpp-tools.jam? It 
allows to extend the toolset and overide the path to the compiler 
installation directory. It doesn't change anything if the compiler is 
in the default search path. I need this for runnning regression tests 
on the same machine for Visual Age 5 and 6 in one go.

Markus
 --------------090807010805010704030008 Content-Type: text/plain;
name="vacpp-tools.jam.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="vacpp-tools.jam.diff"

Index: vacpp-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/vacpp-tools.jam,v
retrieving revision 1.13
diff -c -r1.13 vacpp-tools.jam
*** vacpp-tools.jam	26 Nov 2002 13:46:44 -0000	1.13
--- vacpp-tools.jam	14 Feb 2003 13:42:31 -0000
***************
*** 9,20 ****
# Jam tools information for :
# IBM VisualAge C++ compiler
# version 5.0
#
# These settings are created and tested with VisualAge running on
! # IBM/Aix 3.4. They should also work for VisualAge
! # on Windows NT, OS/2 and AS/400.
! #
! # Current settings tested and working on VisualAge-5/AIX.

flags vacpp CC <threading>single : xlc ;
flags vacpp CC <threading>multi : xlc_r ;
--- 9,21 ----
# Jam tools information for :
# IBM VisualAge C++ compiler
# version 5.0
+ # version 6.0
#
# These settings are created and tested with VisualAge running on
! # IBM/Aix 4.3.3.0. They should also work for VisualAge on Windows NT,
! # OS/2 and AS/400.
! 
! VA_BIN = "" ;

flags vacpp CC <threading>single : xlc ;
flags vacpp CC <threading>multi : xlc_r ;
***************
*** 86,92 ****
# for xlc, we repeat all libraries so that dependencies are always resolved
actions xlc-Link-action bind NEEDLIBS
{
! $(CXX) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) -bdynamic
}

#### Cc #####
--- 87,93 ----
# for xlc, we repeat all libraries so that dependencies are always resolved
actions xlc-Link-action bind NEEDLIBS
{
! $(CXX:R=$(VA_BIN)) $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) -bdynamic
}

#### Cc #####
***************
*** 98,104 ****

actions xlc-Cc-action
{
! $(CC) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
}

#### C++ ####
--- 99,105 ----

actions xlc-Cc-action
{
! $(CC:R=$(VA_BIN)) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
}

#### C++ ####
***************
*** 109,115 ****

actions xlc-C++-action
{
! $(CXX) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
}

#### Archive ####
--- 110,116 ----

actions xlc-C++-action
{
! $(CXX:R=$(VA_BIN)) -c -I$(BOOST_ROOT) -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
}

#### Archive ####
 --------------090807010805010704030008--