Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8573
Modified Files:
Tag: RC_1_34_0
python.jam
Log Message:
Fix bug reported by Markus Schöpflin
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.34
retrieving revision 1.12.2.35
diff -u -d -r1.12.2.34 -r1.12.2.35
--- python.jam 15 Mar 2007 04:02:23 -0000 1.12.2.34
+++ python.jam 16 Mar 2007 15:40:24 -0000 1.12.2.35
@@ -614,7 +614,7 @@
case hpux : return pthread rt ;
- case * : return pthread dl util ;
+ case * : return pthread dl <toolset>gcc:<source>util ;
}
}
@@ -783,13 +783,18 @@
condition += <python>$(version:E=default) ;
}
- # Collect dependencies on system libraries.
+ condition += <target-os>$(target-os) ;
+
+ # Set up the PYTHON variable to point at the interpreter.
+ flags python.capture-output PYTHON $(condition:J=/) : $(interpreter-cmd) ;
+
+ local target-requirements = $(condition) ;
local system-libs ;
for local x in [ system-library-dependencies $(target-os) ]
{
if $(x:G)
{
- condition += $(x) ;
+ target-requirements += $(x) ;
}
else
{
@@ -797,11 +802,6 @@
}
}
- condition += <target-os>$(target-os) ;
-
- # Set up the PYTHON variable to point at the interpreter.
- flags python.capture-output PYTHON $(condition:J=/) : $(interpreter-cmd) ;
-
# Declare the "python" target. This should really be called
python_for_embedding
if $(target-os) = darwin
{
@@ -815,7 +815,7 @@
debug-message framework directory is \"$(fwk)\" ;
alias python
:
- : $(condition)
+ : $(target-requirements)
:
: <include>$(includes) <framework>$(fwk)
;
@@ -825,7 +825,7 @@
local libpython-target-name = [ declare-libpython-target $(version) :
$(target-os) ] ;
alias python
: $(system-libs)
- : $(condition)
+ : $(target-requirements)
:
: <include>$(includes) <library-path>$(libraries)
<library>$(libpython-target-name)
;
@@ -844,13 +844,13 @@
# so we do not need to worry about duplicate Python symbols.
if $(target-os) in windows cygwin darwin
{
- alias python_for_extensions : python : $(condition) ;
+ alias python_for_extensions : python : $(target-requirements) ;
}
else
{
alias python_for_extensions
:
- : $(condition)
+ : $(target-requirements)
:
: <include>$(includes)
;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
