From 83b5af87efef571b707fc1f409f22571a9f5054c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 12 Aug 2016 16:23:37 +0200
Subject: Add support for ordering modules in config.build

---
 build2/install/module.cxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build2/install')

diff --git a/build2/install/module.cxx b/build2/install/module.cxx
index ad2af6c..18ce2ad 100644
--- a/build2/install/module.cxx
+++ b/build2/install/module.cxx
@@ -156,7 +156,6 @@ namespace build2
       //
       // Note that the set_dir() calls below enter some more.
       //
-      if (first)
       {
         auto& v (var_pool);
 
@@ -177,11 +176,17 @@ namespace build2
       // must be explicitly specified or the installer will complain
       // if and when we try to install.
       //
-      if (first)
       {
         using build2::path;
 
         bool s (config::specified (r, "config.install"));
+
+        // Adjust module priority so that the (numerous) config.install.*
+        // values are saved at the end of config.build.
+        //
+        if (s)
+          config::save_module (r, "install", INT32_MAX);
+
         const string& n (cast<string> (r["project"]));
 
         set_dir (s, r, "root",      abs_dir_path (), false, "", "755", path ("install"));
-- 
cgit v1.1