From 9d0db572d5b36e97715e67465f7485c056f3f2d3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 26 Oct 2021 12:09:23 +0200
Subject: Fix few issues in build2 metadata

---
 odb/buildfile | 8 ++++++--
 odb/odb.cxx   | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/odb/buildfile b/odb/buildfile
index 8e931ad..2625e0d 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -67,12 +67,16 @@ exe{odb}: plugin{odb}: include = adhoc
 
 # Target metadata, see also --build2-metadata in odb.cxx.
 #
+# While ODB itself doesn't use any environment variables, it uses GCC
+# underneath which does (see "Environment Variables Affecting GCC").
+#
 exe{odb}:
 {
   export.metadata = 1 odb
   odb.name = [string] odb
-  odb.version  = $version
-  odb.checksum = $version
+  odb.version = [string] $version
+  odb.checksum = [string] $version
+  odb.environment = [strings] CPATH CPLUS_INCLUDE_PATH GCC_EXEC_PREFIX COMPILER_PATH
 }
 
 plugin{odb}: libus{odb}
diff --git a/odb/odb.cxx b/odb/odb.cxx
index 0647bd8..9c9a175 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -616,9 +616,6 @@ main (int argc, char* argv[])
       {
         ostream& o (cout);
 
-        // While ODB itself doesn't use any environment variables, it uses GCC
-        // underneath which does (see "Environment Variables Affecting GCC").
-        //
         // Note that the export.metadata variable should be the first non-
         // blank/comment line.
         //
-- 
cgit v1.1