Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20606
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Merge from trunk
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -d -r1.12.2.3 -r1.12.2.4
--- python.jam 18 May 2006 11:06:48 -0000 1.12.2.3
+++ python.jam 4 Jun 2006 06:56:19 -0000 1.12.2.4
@@ -527,6 +527,12 @@
rule capture-output ( target : sources * : properties * )
{
+ # Setup up proper DLL search path.
+ # Here, $(sources[1]) is python module and $(sources[2]) is
+ # DLL. Only $(sources[1]) is passed to testing.capture-output,
+ # so RUN_PATH variable on $(sources[2]) is not consulted. Move it
+ # over explicitly.
+ RUN_PATH on $(sources[1]) = [ on $(sources[2]) return $(RUN_PATH) ] ;
PYTHONPATH = [ on $(sources[2]) return $(LOCATE) ] ;
testing.capture-output $(target) : $(sources[1]) : $(properties) ;
local c = [ common.prepend-path-variable-command PYTHONPATH :
$(PYTHONPATH) ] ;
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
