diff options
Diffstat (limited to 'build2/cc/common')
| -rw-r--r-- | build2/cc/common | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/build2/cc/common b/build2/cc/common index 3974a03..2c79fa6 100644 --- a/build2/cc/common +++ b/build2/cc/common @@ -97,10 +97,10 @@ namespace build2 // Cached values for some commonly-used variables/values. // - const string& cid; // x.id - const string& ctg; // x.target - const string& tsys; // x.target.system - const string& tclass; // x.target.class + const string& cid; // x.id + const target_triplet& ctg; // x.target + const string& tsys; // x.target.system + const string& tclass; // x.target.class const string& tstd; // Translated x_std value (can be empty). @@ -140,9 +140,7 @@ namespace build2 const char* install, const char* uninstall, const string& id, - const string& tg, - const string& ts, - const string& tc, + const target_triplet& tg, const string& std, const process_path* pkgc, const dir_paths& sld, @@ -155,7 +153,7 @@ namespace build2 x_link (link), x_install (install), x_uninstall (uninstall), - cid (id), ctg (tg), tsys (ts), tclass (tc), + cid (id), ctg (tg), tsys (ctg.system), tclass (ctg.class_), tstd (std), pkgconfig (pkgc), sys_lib_dirs (sld), sys_inc_dirs (sid), x_src (src), x_hdr (hdr), x_inc (inc) {} |