Embed build core version into build system modules as load path

1 files changed, 9 insertions, 4 deletions

diff --git a/libbuild2/version/buildfile b/libbuild2/version/buildfile
index e9d4905..7477815 100644
--- a/libbuild2/version/buildfile
+++ b/libbuild2/version/buildfile
@@ -51,10 +51,15 @@ libs{build2-version}: cxx.export.poptions += -DLIBBUILD2_VERSION_SHARED
 # in place of another pre-release or the final version. See the version module
 # for details on the version.* variable values.
 #
-if $version.pre_release
-  lib{build2-version}: bin.lib.version = @"-$version.project_id"
-else
-  lib{build2-version}: bin.lib.version = @"-$version.major.$version.minor"
+# And seeing that this is a build system module, we also embed the same
+# version as the build system core version.
+#
+ver = ($version.pre_release    \
+       ? "$version.project_id" \
+       : "$version.major.$version.minor")
+
+lib{build2-version}: bin.lib.version = @"-$ver"
+libs{build2-version}: bin.lib.load_suffix = "-$ver"
 
 # Install into the libbuild2/version/ subdirectory of, say, /usr/include/
 # recreating subdirectories.