--- darwin.jam	16 Sep 2006 12:33:43 -0400	1.22
+++ darwin.jam	27 Sep 2006 19:27:01 -0400	
@@ -60,12 +60,42 @@
 
 _ = " " ;
 
+rule link
+{
+    local 
+}
+
+# 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)
     $(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)