From 20c618871859b14ab6353622a422e8a4a2682a29 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 20 Nov 2007 18:05:45 +0000 Subject: [PATCH] Merge 41260 from trunk. Allow indication of the Boost.Build location with an argument. This allows to override the built-in BB when testing. [SVN r41261] --- boost-build.jam | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boost-build.jam b/boost-build.jam index dda1ba26cc..33fcf8a3e9 100644 --- a/boost-build.jam +++ b/boost-build.jam @@ -1,9 +1,11 @@ -#~ Copyright (C) 2002-2003, David Abrahams. -#~ Copyright (C) 2002-2003, Vladimir Prus. -#~ Copyright (C) 2003, Rene Rivera. +#~ Copyright (C) 2002-2003 David Abrahams. +#~ Copyright (C) 2002-2003 Vladimir Prus. +#~ Copyright (C) 2003,2007 Rene Rivera. #~ Use, modification and distribution are subject to the #~ Boost Software License, Version 1.0. (See accompanying file #~ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) BOOST_ROOT = $(.boost-build-file:D) ; -boost-build tools/build/v2 ; +BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ; +BOOST_BUILD ?= tools/build/v2 ; +boost-build $(BOOST_BUILD) ;