From ff8ed209cd80799199e0b2e3d37213d549bc342f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 23 Jun 2017 10:10:13 +0200 Subject: Don't treat mxx{} as cc-source If we do it, then the link rule will refuse to match when modules are disabled (in which case mxx{} should be treated as a header). --- build2/cxx/target.cxx | 2 +- build2/cxx/target.hxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build2/cxx/target.cxx b/build2/cxx/target.cxx index 5641e7a..bde41fc 100644 --- a/build2/cxx/target.cxx +++ b/build2/cxx/target.cxx @@ -68,7 +68,7 @@ namespace build2 const target_type mxx::static_type { "mxx", - &cc::static_type, + &file::static_type, &target_factory, &target_extension_var, &target_pattern_var, diff --git a/build2/cxx/target.hxx b/build2/cxx/target.hxx index f5591d1..ff1d077 100644 --- a/build2/cxx/target.hxx +++ b/build2/cxx/target.hxx @@ -61,12 +61,12 @@ namespace build2 // The module interface unit is both like a header (e.g., we need to // install it) and like a source (we need to compile it). Plus, to // support dual use (modules/headers) it could actually be #include'd - // (and in both cases). + // (and even in both cases). // - class mxx: public cc::cc + class mxx: public file { public: - using cc::cc; + using file::file; public: static const target_type static_type; -- cgit v1.1