From fd863534dc6cf6a4d6bd3278b96690f66cbc4706 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 3 Apr 2020 16:44:41 +0200
Subject: Tweak ~host configuration extraction regex

---
 libbuild2/buildfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libbuild2/buildfile b/libbuild2/buildfile
index 578a4c8..edd0570 100644
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -65,10 +65,12 @@ config/cxx{host-config}: config/in{host-config}
     [null],                                             \
     return_lines)
 
-  host_config = $regex.replace_lines(             \
-    $build2_config,                               \
-    '^ *config\.(c[. ]|cxx[. ]|cc[.]|bin[.]).*$', \
-    '$&',                                         \
+  # Also preserve blank lines between groups of options.
+  #
+  host_config = $regex.replace_lines(                \
+    $build2_config,                                  \
+    '^( *config\.(c[. ]|cxx[. ]|cc[.]|bin[.]).*|)$', \
+    '$&',                                            \
     format_no_copy return_lines)
 }
 
-- 
cgit v1.1