mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Fix order of directories in BOOST_BUILD_PATH.
In 'boost-build', add the directory given as argument *after* existing directories. So, if user set in environment BOOST_BUILD_PATH=/home/custom_bb_files, then files from that directory will be loaded before any stock files. In particular, this fixes searching of user-config.jam in environmental BOOST_BUILD_PATH. [SVN r33348]
This commit is contained in:
@@ -79,7 +79,7 @@ rule boost-build ( dir ? )
|
||||
# Add the given directory to the path so we can find the build
|
||||
# system. If dir is empty, has no effect.
|
||||
#
|
||||
BOOST_BUILD_PATH = $(dir:R=$(.boost-build-file:D)) $(BOOST_BUILD_PATH) ;
|
||||
BOOST_BUILD_PATH = $(BOOST_BUILD_PATH) $(dir:R=$(.boost-build-file:D)) ;
|
||||
|
||||
# We might have just modified the *global* value of BOOST_BUILD_PATH.
|
||||
# The code that loads the rest of Boost.Build, in particular the
|
||||
|
||||
@@ -40,7 +40,7 @@ char *jambase[] = {
|
||||
"ECHO ;\n",
|
||||
"EXIT \"Please consult the documentation at 'http://www.boost.org'.\" ;\n",
|
||||
"}\n",
|
||||
"BOOST_BUILD_PATH = $(dir:R=$(.boost-build-file:D)) $(BOOST_BUILD_PATH) ;\n",
|
||||
"BOOST_BUILD_PATH = $(BOOST_BUILD_PATH) $(dir:R=$(.boost-build-file:D)) ;\n",
|
||||
"_poke .ENVIRON : BOOST_BUILD_PATH : $(BOOST_BUILD_PATH) ;\n",
|
||||
"local bootstrap-file =\n",
|
||||
"[ GLOB $(BOOST_BUILD_PATH) : bootstrap.jam ] ;\n",
|
||||
|
||||
Reference in New Issue
Block a user