Merge branch 'feature/gcc-cleanup' into develop

.travis.yml

@@ -27,5 +27,3 @@ script:
   - ./bootstrap.sh --with-toolset=${TOOLSET}
   - cd test
   - DO_DIFF=diff python test_all.py ${TOOLSET} ${TEST_ALL_EXTRAS}
-  - DO_DIFF=diff python library_chain.py --verbose ${TOOLSET} ${TEST_ALL_EXTRAS}
-  - DO_DIFF=diff python searched_lib.py --verbose ${TOOLSET} ${TEST_ALL_EXTRAS}

src/build/virtual-target.jam

@@ -794,7 +794,9 @@ class action
             # rules.
             .action on $(actual-targets) = $(__name__) ;
 
-            indirect.call $(self.action-name) $(actual-targets)
+            #indirect.call $(self.action-name) $(actual-targets)
+            #    : $(self.actual-sources) : [ $(properties).raw ] ;
+            execute $(self.action-name) $(actual-targets)
                 : $(self.actual-sources) : [ $(properties).raw ] ;
 
             # Since we set up the creating action here, we set up the action for
@@ -865,6 +867,19 @@ class action
     {
         return $(property-set) ;
     }
+
+    # Execute the action rule on the given targets, sources, and properties.
+    # Since this does the final call to the engine action rule this takes
+    # engine level targets and raw properties. One could override this, for
+    # example, to set additional variables on hte target that might be
+    # difficult to determine just using toolset flags.
+    # Note, you must call this base rule when overriding as otherwise the
+    # actions will not execute and the engine will not run commands.
+    #
+    rule execute ( action-name targets + : sources * : properties * )
+    {
+        indirect.call $(action-name) $(targets) : $(sources) : $(properties) ;
+    }
 }
 
 

src/tools/clang-darwin.jam

@@ -66,7 +66,7 @@ rule init ( version ? :  command * : options * )
 
     common.handle-options clang-darwin : $(condition) : $(command) : $(options) ;
 
-    gcc.init-link-flags clang-darwin darwin $(condition) ;
+    gcc.init-link-flags clang darwin $(condition) ;
 
 }
 

src/tools/clang-linux.jam

@@ -60,7 +60,7 @@ rule init ( version ? :  command * : options * ) {
 
   common.handle-options clang-linux : $(condition) : $(command) : $(options) ;
 
-  gcc.init-link-flags clang-linux gnu $(condition) ;
+  gcc.init-link-flags clang linux $(condition) ;
 }
 
 ###############################################################################

src/tools/common.jam

@@ -208,6 +208,13 @@ rule check-init-parameters ( toolset requirement * : * )
         }
         sig = $(sig)$(value:E="")- ;
     }
+    # We also need to consider requirements on the toolset as we can
+    # configure the same toolset multiple times with different options that
+    # are selected with the requirements.
+    if $(requirement)
+    {
+        sig = $(sig)$(requirement:J=,) ;
+    }
     if $(sig) in $(.all-signatures)
     {
         local message =