From a9a3c04a70f6402cc05e57e18cefb1cfacd0f3d7 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Thu, 28 Sep 2006 22:28:47 +0000
Subject: [PATCH] merged from HEAD

[SVN r35403]
---
 src/tools/darwin.jam | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/tools/darwin.jam b/src/tools/darwin.jam
index 74cc2f0d4..14dd0008e 100644
--- a/src/tools/darwin.jam
+++ b/src/tools/darwin.jam
@@ -60,15 +60,40 @@ flags darwin.link FRAMEWORK <framework> ;
 
 _ = " " ;
 
+# set up the -F option to include the paths to any frameworks used.
+local rule prepare-framework-path ( target + )
+{
+    local framework-path = [ on $(target) return $(FRAMEWORK:D) ] ;
+    
+    if $(framework-path)
+    {
+        FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
+    }
+    else
+    {
+        FRAMEWORK_PATH on $(target) = ;
+    }
+}
+
+rule link
+{
+    prepare-framework-path $(<) ;
+}
+
 actions link bind LIBRARIES
 {
-    $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -F$(FRAMEWORK:D) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
+    $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
     $(NEED_STRIP)strip $(NEED_STRIP)"$(<)"
 }
 
+rule link.dll
+{
+    prepare-framework-path $(<) ;
+}
+
 actions link.dll bind LIBRARIES
 {
-    $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -F$(FRAMEWORK:D)  -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
+    $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
 }
 
 actions piecemeal archive