From c6fdd41d4d968b46f84c4ffb37f13ac11fc22b1f Mon Sep 17 00:00:00 2001
From: Andrew McCann <amccann@gmail.com>
Date: Tue, 22 May 2018 16:20:01 -0700
Subject: [PATCH] Reenable ability of generators to return property-set as
 first item in result list

- Fixes issue introduced in ee613a6a28 (feature relevance)
---
 src/build/generators.jam | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/build/generators.jam b/src/build/generators.jam
index 631251b3c..14ca2c9fc 100644
--- a/src/build/generators.jam
+++ b/src/build/generators.jam
@@ -475,7 +475,13 @@ class generator
         }
         if $(result)
         {
-            return $(relevant) $(result) ;
+            if [ class.is-a $(result[1]) : property-set ]
+            {
+                return [ $(result[1]).add $(relevant) ] $(result[2-]) ;
+            }
+            else {
+               return $(relevant) $(result) ;
+            }
         }
     }