From 444fa3c2549d8eae4ef4fa2e3c2d4d448a2196f3 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 16 Mar 2007 23:05:14 +0000
Subject: [PATCH] Make sure that the libpython target is declared with distinct
 requirements each time, thus forming valid target alternatives.

[SVN r37210]
---
 v2/tools/python.jam | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/v2/tools/python.jam b/v2/tools/python.jam
index a8d1868dc..14c01eeb7 100644
--- a/v2/tools/python.jam
+++ b/v2/tools/python.jam
@@ -622,12 +622,12 @@ local rule system-library-dependencies ( target-os )
 
 # Declare a target to represent Python's library, returning the target
 # name.
-local rule declare-libpython-target ( version ? : target-os )
+local rule declare-libpython-target ( version ? : sys.platform : requirements * )
 {
     # Compute the representation of Python version in the name of
     # Python's library file.
     local lib-version = $(version) ;
-    if $(target-os) = windows
+    if <target-os>windows in $(requirements)
     {
         local major-minor = [ split-version $(version) ] ;
         lib-version = $(major-minor:J="") ;
@@ -638,7 +638,7 @@ local rule declare-libpython-target ( version ? : target-os )
     libpython-target-name = $(libpython-target-name:J=-) ;
     
     # Declare and return it
-    lib $(libpython-target-name) : : <name>python$(lib-version) ;
+    lib $(libpython-target-name) : : <name>python$(lib-version) $(requirements) ;
     return $(libpython-target-name) ;
 }
 
@@ -824,7 +824,9 @@ local rule configure (
     }
     else
     {
-        local libpython-target-name = [ declare-libpython-target $(version) : $(target-os) ] ;
+        local libpython-target-name
+          = [ declare-libpython-target $(version) : $(sys.platform) : $(target-requirements) ] ;
+        
         alias python
           : $(system-libs) 
           : $(target-requirements)