aboutsummaryrefslogtreecommitdiff
path: root/build/cxx/module.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'build/cxx/module.cxx')
-rw-r--r--build/cxx/module.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/build/cxx/module.cxx b/build/cxx/module.cxx
index 846e324..3e0101f 100644
--- a/build/cxx/module.cxx
+++ b/build/cxx/module.cxx
@@ -108,6 +108,8 @@ namespace build
// is important to distinguish between the "configured as
// unspecified" and "not configured" cases).
//
+ // We also merge them into the corresponding cxx.* variables.
+ //
{
auto v (root["config.cxx.poptions"]);
@@ -115,6 +117,8 @@ namespace build
{
if (v.belongs (*global_scope))
root.assign ("config.cxx.poptions") = v;
+
+ root.append ("cxx.poptions") += v;
}
else
root.assign ("config.cxx.poptions") = nullptr;
@@ -127,6 +131,8 @@ namespace build
{
if (v.belongs (*global_scope))
root.assign ("config.cxx.coptions") = v;
+
+ root.append ("cxx.coptions") += v;
}
else
root.assign ("config.cxx.coptions") = nullptr;
@@ -139,6 +145,8 @@ namespace build
{
if (v.belongs (*global_scope))
root.assign ("config.cxx.loptions") = v;
+
+ root.append ("cxx.loptions") += v;
}
else
root.assign ("config.cxx.loptions") = nullptr;
@@ -151,6 +159,8 @@ namespace build
{
if (v.belongs (*global_scope))
root.assign ("config.cxx.libs") = v;
+
+ root.append ("cxx.libs") += v;
}
else
root.assign ("config.cxx.libs") = nullptr;