aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-06-12 11:56:16 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-06-12 11:56:16 +0200
commit44e27fb5a54bc95af5f9533cd5c1a85eb532ca90 (patch)
tree004b0cd1009617404522d8371e7ea15286da2e41
parent43ec011824c8210859dcebe34629218b2ee25487 (diff)
Fix couple of deadly bugs
-rw-r--r--build2/cc/compile.cxx2
-rw-r--r--build2/test/script/builtin.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 31986ed..d72ad90 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -2410,7 +2410,7 @@ namespace build2
case compiler_id::gcc:
{
s.insert (0, 1, '=');
- s.insert (0, cast<string> (f->group->vars[c_module_name]));
+ s.insert (0, cast<string> ((*f)[c_module_name]));
s.insert (0, "-fmodule-map=");
break;
}
diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx
index 62f011b..079a12d 100644
--- a/build2/test/script/builtin.cxx
+++ b/build2/test/script/builtin.cxx
@@ -1359,7 +1359,7 @@ namespace build2
{
return builtin (
r,
- thread ([&fn, &sp, &r, &args,
+ thread ([fn, &sp, &r, &args,
in = move (in),
out = move (out),
err = move (err)] () mutable noexcept