Boost logo

Boost-Commit :

From: roland.schwarz_at_[hidden]
Date: 2007-08-13 11:35:18


Author: speedsnail
Date: 2007-08-13 11:35:16 EDT (Mon, 13 Aug 2007)
New Revision: 38618
URL: http://svn.boost.org/trac/boost/changeset/38618

Log:
Revert the last change, since the directory passed to boost-build should be first in searched paths, else project local build system will not be picked correctly.
The order had been changed to allow searching of alternate user-config.jam files from boost build. This better should be done with --user-config= switch or similar.
Text files modified:
   trunk/tools/jam/src/Jambase | 2 +-
   trunk/tools/jam/src/jambase.c | 2 +-
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/tools/jam/src/Jambase
==============================================================================
--- trunk/tools/jam/src/Jambase (original)
+++ trunk/tools/jam/src/Jambase 2007-08-13 11:35:16 EDT (Mon, 13 Aug 2007)
@@ -79,7 +79,7 @@
     # Add the given directory to the path so we can find the build
     # system. If dir is empty, has no effect.
     #
- BOOST_BUILD_PATH = $(BOOST_BUILD_PATH) $(dir:R=$(.boost-build-file:D)) ;
+ BOOST_BUILD_PATH = $(dir:R=$(.boost-build-file:D)) $(BOOST_BUILD_PATH) ;
     
     # We might have just modified the *global* value of BOOST_BUILD_PATH.
     # The code that loads the rest of Boost.Build, in particular the

Modified: trunk/tools/jam/src/jambase.c
==============================================================================
--- trunk/tools/jam/src/jambase.c (original)
+++ trunk/tools/jam/src/jambase.c 2007-08-13 11:35:16 EDT (Mon, 13 Aug 2007)
@@ -40,7 +40,7 @@
 "ECHO ;\n",
 "EXIT \"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
 "}\n",
-"BOOST_BUILD_PATH = $(BOOST_BUILD_PATH) $(dir:R=$(.boost-build-file:D)) ;\n",
+"BOOST_BUILD_PATH = $(dir:R=$(.boost-build-file:D)) $(BOOST_BUILD_PATH) ;\n",
 "_poke .ENVIRON : BOOST_BUILD_PATH : $(BOOST_BUILD_PATH) ;\n",
 "local bootstrap-file =\n",
 "[ GLOB $(BOOST_BUILD_PATH) : bootstrap.jam ] ;\n",


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk