import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / tools / build / src / build / targets.jam

diff --git a/ceph/src/boost/tools/build/src/build/targets.jam b/ceph/src/boost/tools/build/src/build/targets.jam
index b16429d22970bba16706529fe6c60d5d5f5b383d..ddfdd33843c3e74cf0e087518190ab3cc4263006 100644 (file)
--- a/ceph/src/boost/tools/build/src/build/targets.jam
+++ b/ceph/src/boost/tools/build/src/build/targets.jam
@@ -893,7 +893,7 @@ rule resolve-reference ( target-reference : project )
     if $(split[3])
     {
         sproperties = [ property.make [ feature.split $(split[3]) ] ] ;
-        sproperties = [ feature.expand-composites $(sproperties) ] ;
+        sproperties = [ feature.expand $(sproperties) ] ;
     }
 
     # Find the target.
@@ -1376,20 +1376,20 @@ class basic-target : abstract-target
                         [ property.change [ $(gur).raw ] : <relevant> ]
                         <relevant>$(relevant) ] ;
 
+                    local s = [ create-subvariant $(result)
+                        : [ virtual-target.recent-targets ]
+                        : $(property-set) : $(source-targets)
+                        : $(rproperties) : $(usage-requirements) ] ;
+                    virtual-target.clear-recent-targets ;
+
                     if $(self.always)
                     {
-                        for local t in $(result)
+                        for local t in [ $(s).created-targets ]
                         {
                             $(t).always ;
                         }
                     }
 
-                    local s = [ create-subvariant $(result)
-                        : [ virtual-target.recent-targets ]
-                        : $(property-set) : $(source-targets)
-                        : $(rproperties) : $(usage-requirements) ] ;
-                    virtual-target.clear-recent-targets ;
-
                     local ur = [ compute-usage-requirements $(s) ] ;
                     ur = [ $(ur).add $(gur) ] ;
                     $(s).set-usage-requirements $(ur) ;
@@ -1577,7 +1577,7 @@ class basic-target : abstract-target
 
     # Constructs virtual targets for this abstract target and the dependency
     # graph. Returns a usage-requirements property-set and a list of virtual
-    # targets. Should be overriden in derived classes.
+    # targets. Should be overridden in derived classes.
     #
     rule construct ( name : source-targets * : properties * )
     {