diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-22 13:24:59 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-22 13:24:59 +0200 |
commit | 9a00b8ccfef1d13088be2d76fefcb320c269732a (patch) | |
tree | 40a7efc0bc0116cbbf035310b9341d83a0793a07 /build2/cc | |
parent | e52f8358ce533742a0357fabebd96fb7f5b2609a (diff) |
Add extra support for symbol exporting in modularized projects
Since modules don't see each other's macros, we can use a single, keyword-
like macro for dll-exporting that is managed by the build system (so no
need for an "export" header). For example:
cxx.features.symexport = true
export __symexport void f ();
Diffstat (limited to 'build2/cc')
-rw-r--r-- | build2/cc/common.hxx | 5 | ||||
-rw-r--r-- | build2/cc/compile.cxx | 26 | ||||
-rw-r--r-- | build2/cc/compile.hxx | 3 |
3 files changed, 31 insertions, 3 deletions
diff --git a/build2/cc/common.hxx b/build2/cc/common.hxx index 24262b7..abeadfc 100644 --- a/build2/cc/common.hxx +++ b/build2/cc/common.hxx @@ -115,7 +115,8 @@ namespace build2 const strings& tstd; // Translated x_std value (options). - bool modules; // x.feaures.modules + bool modules; // x.features.modules + bool symexport; // x.features.symexport const process_path* pkgconfig; // pkgconfig.path (can be NULL). const dir_paths& sys_lib_dirs; // x.sys_lib_dirs @@ -159,6 +160,7 @@ namespace build2 const target_triplet& tg, const strings& std, bool fm, + bool fs, const process_path* pkgc, const dir_paths& sld, const dir_paths& sid, @@ -175,6 +177,7 @@ namespace build2 ctg (tg), tsys (ctg.system), tclass (ctg.class_), tstd (std), modules (fm), + symexport (fs), pkgconfig (pkgc), sys_lib_dirs (sld), sys_inc_dirs (sid), x_src (src), x_mod (mod), x_hdr (hdr), x_inc (inc) {} }; diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index dc669ce..eddd465 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -196,6 +196,18 @@ namespace build2 return nullptr; } + inline void compile:: + append_symexport_options (cstrings& args, const target& t) const + { + // With VC if a BMI is compiled with dllexport, then when such BMI is + // imported, it is auto-magically treated as dllimport. Let's hope + // other compilers follow suit. + // + args.push_back (t.is_a<bmis> () && tclass == "windows" + ? "-D__symexport=__declspec(dllexport)" + : "-D__symexport="); + } + match_result compile:: match (action act, target& t, const string&) const { @@ -683,10 +695,11 @@ namespace build2 // sha256 cs; - // This affects how we compile the source as well as the format of - // depdb so factor it in. + // These flags affect how we compile the source and/or the format of + // depdb so factor them in. // cs.append (&md.pp, sizeof (md.pp)); + cs.append (&symexport, sizeof (symexport)); if (md.pp != preprocessed::all) { @@ -1392,6 +1405,9 @@ namespace build2 args.push_back (d.string ().c_str ()); } + if (symexport && md.mod) + append_symexport_options (args, t); + // Some compile options (e.g., -std, -m) affect the preprocessor. // // Currently Clang supports importing "header modules" even when in @@ -2272,6 +2288,9 @@ namespace build2 args.push_back (d.string ().c_str ()); } + if (symexport && md.mod) + append_symexport_options (args, t); + append_options (args, t, c_coptions); append_options (args, t, x_coptions); append_options (args, tstd, @@ -3108,6 +3127,9 @@ namespace build2 args.push_back ("-I"); args.push_back (d.string ().c_str ()); } + + if (symexport && md.mod) + append_symexport_options (args, t); } append_options (args, t, c_coptions); diff --git a/build2/cc/compile.hxx b/build2/cc/compile.hxx index be4a2e2..ed9c18d 100644 --- a/build2/cc/compile.hxx +++ b/build2/cc/compile.hxx @@ -123,6 +123,9 @@ namespace build2 const char* langopt (const match_data&) const; + void + append_symexport_options (cstrings&, const target&) const; + private: const string rule_id; }; |