From b70405649fe8a302ac27d62865e59f9bc674fea7 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Tue, 17 Jan 2006 09:55:16 +0000
Subject: [PATCH] When building searched libraries, return 'xdll-path'
 properties for each 'search' property. This makes sure that linking againsts
 searched library in custom directory works on gcc, and that proper run-time
 library search path is set by 'unit-test' and 'run' rule.

[SVN r32342]
---
 src/tools/builtin.jam | 7 +++++--
 src/tools/unix.jam    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/tools/builtin.jam b/src/tools/builtin.jam
index 4276c24d0..65f240b11 100644
--- a/src/tools/builtin.jam
+++ b/src/tools/builtin.jam
@@ -495,18 +495,21 @@ class searched-lib-generator : generator
             {
                 shared = true ;
             }        
+            
+            local search = [ feature.get-values <search> : $(properties) ] ;
 
             a = [ new null-action $(property-set) ] ;
             local t = [ new searched-lib-target $(name) : $(project) : $(shared)
                             : [ feature.get-values <name> : $(properties) ]
-                            : [ feature.get-values <search> : $(properties) ]
+                            : $(search)
                             : $(a)
                       ] ;
             # We return sources for a simple reason. If there's
             #    lib png : z : <name>png ; 
             # the 'z' target should be returned, so that apps linking to
             # 'png' will link to 'z', too.
-            return [ virtual-target.register $(t) ] $(sources) ;
+            return [ property-set.create <xdll-path>$(search) ]
+                   [ virtual-target.register $(t) ] $(sources) ;
         }
     }        
 }
diff --git a/src/tools/unix.jam b/src/tools/unix.jam
index 3feff168b..29f869488 100644
--- a/src/tools/unix.jam
+++ b/src/tools/unix.jam
@@ -112,7 +112,7 @@ class unix-searched-lib-generator : searched-lib-generator
         local result = [ searched-lib-generator.run $(project) $(name) 
           : $(property-set) : $(sources) ] ;
         
-        unix.set-library-order $(sources) : $(property-set) : $(result) ;
+        unix.set-library-order $(sources) : $(property-set) : $(result[2-]) ;
         
         return $(result) ;
     }