From 44e27fb5a54bc95af5f9533cd5c1a85eb532ca90 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 12 Jun 2017 11:56:16 +0200 Subject: Fix couple of deadly bugs --- build2/cc/compile.cxx | 2 +- build2/test/script/builtin.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'build2') 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 (f->group->vars[c_module_name])); + s.insert (0, cast ((*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 -- cgit v1.1