From 0d34b2f7692aba066213c038b810623c216b6980 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 27 Nov 2017 11:42:35 +0200 Subject: Add {c,cxx}.class variables Compiler class describes a set of compilers that follow more or less the same command line interface. Compilers that don't belong to any of the existing classes are in classes of their own (say, Sun CC would be on its own if we were to support it). Currently defined compiler classes: gcc gcc, clang, clang-apple, icc (on non-Windows) msvc msvc, clang-cl, icc (Windows) --- build2/cc/common.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build2/cc/common.cxx') diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx index e022abb..951cc47 100644 --- a/build2/cc/common.cxx +++ b/build2/cc/common.cxx @@ -532,7 +532,7 @@ namespace build2 // const char* e (""); - if (cid == compiler_id::msvc) + if (cclass == compiler_class::msvc) { an = path (name); e = "lib"; @@ -560,7 +560,7 @@ namespace build2 { const char* e (""); - if (cid == compiler_id::msvc) + if (cclass == compiler_class::msvc) { sn = path (name); e = "dll.lib"; @@ -679,7 +679,7 @@ namespace build2 // // If we didn't find .dll.lib then we cannot assume .lib is static. // - if (!an.empty () && (s != nullptr || cid != compiler_id::msvc)) + if (!an.empty () && (s != nullptr || cclass != compiler_class::msvc)) { f = d; f /= an; @@ -700,7 +700,7 @@ namespace build2 // Alternative search for VC. // - if (cid == compiler_id::msvc) + if (cclass == compiler_class::msvc) { const scope& rs (*p.scope->root_scope ()); const process_path& ld (cast (rs["bin.ld.path"])); @@ -899,7 +899,7 @@ namespace build2 dir_path d; - if (cid == compiler_id::msvc) + if (cclass == compiler_class::msvc) { // /LIBPATH: (case-insensitive). // -- cgit v1.1