From b3bc26dc284cf73e97b88c9979d49368d07e686c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 26 Mar 2021 16:03:29 +0200
Subject: Add support for propagating project environment

---
 libbuild2/dist/operation.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'libbuild2/dist')

diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx
index f04a809..edb8162 100644
--- a/libbuild2/dist/operation.cxx
+++ b/libbuild2/dist/operation.cxx
@@ -426,6 +426,10 @@ namespace build2
         add_subdir (rs, dir_path (), files);
       }
 
+      // Apply project environment.
+      //
+      auto_project_env penv (rs);
+
       dir_path td (dist_root / dir_path (dist_package));
 
       // Clean up the target directory.
@@ -502,7 +506,10 @@ namespace build2
           }
 
           if (path_match (t.path ().leaf ().string (), pat.leaf ().string ()))
+          {
+            auto_project_env penv (*srs);
             cb.function (r, *srs, cb.data);
+          }
         }
 
         if (prog)
-- 
cgit v1.1