aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/c
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-01-30 11:06:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-01-30 11:06:22 +0200
commitf6319b258bb478e19d4a17852a8406e6b1119b87 (patch)
tree69035ffe5280b76b1eeb948fe115faec4ed6da5e /libbuild2/c
parentb7beffa3db7103f5b800dd2ee004fe62bb577cd8 (diff)
Rework include translation support
See the config.cxx.translate_include variable documentation in cxx/init.cxx for details.
Diffstat (limited to 'libbuild2/c')
-rw-r--r--libbuild2/c/init.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/libbuild2/c/init.cxx b/libbuild2/c/init.cxx
index 227afb2..afd8f88 100644
--- a/libbuild2/c/init.cxx
+++ b/libbuild2/c/init.cxx
@@ -175,7 +175,7 @@ namespace build2
vp.insert<strings> ("config.c.loptions"),
vp.insert<strings> ("config.c.aoptions"),
vp.insert<strings> ("config.c.libs"),
- nullptr /* config.c.translatable_headers */,
+ nullptr /* config.c.translate_include */,
vp.insert<process_path_ex> ("c.path"),
vp.insert<strings> ("c.mode"),
@@ -192,7 +192,7 @@ namespace build2
vp.insert<strings> ("c.aoptions"),
vp.insert<strings> ("c.libs"),
- nullptr /* c.translatable_headers */,
+ nullptr /* c.translate_include */,
vp["cc.poptions"],
vp["cc.coptions"],
@@ -220,6 +220,7 @@ namespace build2
vp["cc.type"],
vp["cc.system"],
vp["cc.module_name"],
+ vp["cc.importable"],
vp["cc.reprocess"],
vp.insert<string> ("c.preprocessed"), // See cxx.preprocessed.
@@ -259,7 +260,8 @@ namespace build2
// Alias some cc. variables as c.
//
- vp.insert_alias (d.c_runtime, "c.runtime");
+ vp.insert_alias (d.c_runtime, "c.runtime");
+ vp.insert_alias (d.c_importable, "c.importable");
auto& m (extra.set_module (new config_module (move (d))));
m.guess (rs, loc, extra.hints);
@@ -363,7 +365,7 @@ namespace build2
};
auto& m (extra.set_module (new module (move (d))));
- m.init (rs, loc, extra.hints);
+ m.init (rs, loc, extra.hints, *cm.x_info);
return true;
}