Ticket #6662: clang-framework.patch

tools/build/v2/tools/clang-darwin.jam

@@ -13 +13 @@
 import common ;
 import errors ;
 import generators ;
+import darwin ;
 
 feature.extend-subfeature toolset clang : platform : darwin ;
 
@@ -74 +75 @@
 
 flags clang-darwin.compile OPTIONS <cflags> ;
 flags clang-darwin.compile OPTIONS <cxxflags> ;
+flags clang-darwin.compile FRAMEWORK <framework> ;
 # flags clang-darwin.compile INCLUDES <include> ;
 
 # Declare flags and action for compilation.
@@ -94 +96 @@
 toolset.flags clang-darwin.compile OPTIONS <profiling>on : -pg ;
 toolset.flags clang-darwin.compile OPTIONS <rtti>off : -fno-rtti ;
 
+rule compile.c ( targets * : sources * : properties * )
+{
+  darwin.prepare-framework-path $(<) ;
+}
+
 actions compile.c
 {
-    "$(CONFIG_COMMAND)" -x c $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -x c $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" $(FRAMEWORK_PATH) -c -o "$(<)" "$(>)"
+}
+
+rule compile.c++ ( targets * : sources * : properties * )
+{
+  darwin.prepare-framework-path $(<) ;
 }
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" -x c++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -x c++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" $(FRAMEWORK_PATH) -c -o "$(<)" "$(>)"
 }
 
 flags clang-darwin ARFLAGS <archiveflags> ;
@@ -149 +161 @@
 }
 
 flags clang-darwin.link USER_OPTIONS <linkflags> ;
+flags clang-darwin.link FRAMEWORK <framework> ;
 
 # Declare actions for linking
 rule link ( targets * : sources * : properties * )
@@ -157 +170 @@
   # Serialize execution of the 'link' action, since
   # running N links in parallel is just slower.
   JAM_SEMAPHORE on $(targets) = <s>clang-darwin-link-semaphore ;
+  darwin.prepare-framework-path $(<) ;
 }
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
+    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(SPACE)$(FRAMEWORK:D=:S=) $(OPTIONS)
 }
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" -single_module -dynamiclib -install_name "$(<[1]:D=)" "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
+    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" -single_module -dynamiclib -install_name "$(<[1]:D=)" "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(SPACE)$(FRAMEWORK:D=:S=) $(OPTIONS)
 }

tools/build/v2/tools/darwin.jam

@@ -529 +529 @@
 _ = " " ;
 
 # set up the -F option to include the paths to any frameworks used.
-local rule prepare-framework-path ( target + )
+rule prepare-framework-path ( target + )
 {
     # The -framework option only takes basename of the framework.
     # The -F option specifies the directories where a framework