[Boost-commit] svn:boost r50389 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r50389 - trunk/tools/build/v2/tools
From: john_at_[hidden]
Date: 2008-12-27 08:46:35

Author: johnmaddock
Date: 2008-12-27 08:46:34 EST (Sat, 27 Dec 2008)
New Revision: 50389
URL: http://svn.boost.org/trac/boost/changeset/50389

Log:
Add additional search path for libraries with Intel on Linux or Darwin: Intel-11 and later has changed the installation directory structure compared to previous versions.
Text files modified: 
   trunk/tools/build/v2/tools/intel-darwin.jam |     6 +++++-                                  
   trunk/tools/build/v2/tools/intel-linux.jam  |     6 +++++-                                  
   2 files changed, 10 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-darwin.jam	(original)
+++ trunk/tools/build/v2/tools/intel-darwin.jam	2008-12-27 08:46:34 EST (Sat, 27 Dec 2008)
@@ -68,7 +68,11 @@
     
         if $(root)
         {
-            local lib_path = $(root)/lib ;
+            # Libraries required to run the executable may be in either
+            # $(root)/lib (10.1 and earlier) 
+            #     or 
+            # $(root)/lib/architecture-name (11.0 and later:
+            local lib_path = $(root)/lib $(root:P)/lib/$(bin:B) ;
             if $(.debug-configuration)
             {
                 ECHO notice: using intel libraries :: $(condition) :: $(lib_path) ;

Modified: trunk/tools/build/v2/tools/intel-linux.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-linux.jam	(original)
+++ trunk/tools/build/v2/tools/intel-linux.jam	2008-12-27 08:46:34 EST (Sat, 27 Dec 2008)
@@ -58,7 +58,11 @@
     
         if $(root)
         {
-            local lib_path = $(root)/lib ;
+            # Libraries required to run the executable may be in either
+            # $(root)/lib (10.1 and earlier) 
+            #     or 
+            # $(root)/lib/architecture-name (11.0 and later:
+            local lib_path = $(root)/lib $(root:P)/lib/$(bin:B) ;
             if $(.debug-configuration)
             {
                 ECHO notice: using intel libraries :: $(condition) :: $(lib_path) ;