1 files changed, 15 insertions, 5 deletions
diff --git a/libbuild2/cc/common.hxx b/libbuild2/cc/common.hxx
index d32d945..68546f6 100644
--- a/libbuild2/cc/common.hxx
+++ b/libbuild2/cc/common.hxx
@@ -102,11 +102,21 @@ namespace build2
 
       const variable& x_class;
 
-      const variable& x_version;
-      const variable& x_version_major;
-      const variable& x_version_minor;
-      const variable& x_version_patch;
-      const variable& x_version_build;
+      // Note: must be adjacent (used as an array).
+      //
+      const variable* x_version;
+      const variable* x_version_major;
+      const variable* x_version_minor;
+      const variable* x_version_patch;
+      const variable* x_version_build;
+
+      // Note: must be adjacent (used as an array).
+      //
+      const variable* x_variant_version;
+      const variable* x_variant_version_major;
+      const variable* x_variant_version_minor;
+      const variable* x_variant_version_patch;
+      const variable* x_variant_version_build;
 
       const variable& x_signature;
       const variable& x_checksum;