From 20065dfe2131dd65f528f0f812520b78ee625f65 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Wed, 29 Mar 2006 15:20:08 +0000
Subject: [PATCH] Fix LD_LIBRARY_PATH setting for 64-bit gcc.

[SVN r33521]
---
 src/tools/gcc.jam | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index 4e6551125..0ec3f24ec 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -84,7 +84,12 @@ rule init ( version ? : command * : options * )
     # (for unit-test/run rules).       
     if $(command)
     {
-        local lib_path = $(root)/lib ;
+        # On multilib 64-bit boxes, there are both 32-bit and 64-bit
+        # libraries and all must be added to LD_LIBRARY_PATH. The linker
+        # will pick the right onces.
+        # Note that we don't provide a clean way to build 32-bit binary
+        # with 64-bit compiler, but user can always pass -m32 manually.
+        local lib_path = $(root)/lib $(root)/lib32 $(root)/lib64 ;
         if $(.debug-configuration)
         {
             ECHO notice: using gcc libraries :: $(condition) :: $(lib_path) ;