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

From: ghost_at_[hidden]
Date: 2008-02-07 06:04:30

Author: vladimir_prus
Date: 2008-02-07 06:04:30 EST (Thu, 07 Feb 2008)
New Revision: 43152
URL: http://svn.boost.org/trac/boost/changeset/43152

Log:
Fix <framework> with no path.

Patch from Jon Olsson.

Text files modified: 
   trunk/tools/build/v2/tools/darwin.jam |    12 ++++++++++--                            
   1 files changed, 10 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/darwin.jam	(original)
+++ trunk/tools/build/v2/tools/darwin.jam	2008-02-07 06:04:30 EST (Thu, 07 Feb 2008)
@@ -171,9 +171,17 @@
 # set up the -F option to include the paths to any frameworks used.
 local rule prepare-framework-path ( target + )
 {
+    # The -framework option only takes basename of the framework.
+    # The -F option specifies the directories where a framework
+    # is searched for.  So, if we find <framework> feature
+    # with some path, we need to generate property -F option.
     local framework-path = [ on $(target) return $(FRAMEWORK:D) ] ;
-    
-    FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
+
+    # Be sure to generate no -F if there's no path.
+    if $(framework-path) != ""
+    {
+        FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
+    }
 }
 
 rule link