From 1f19e236210c2e45ad1349f9977b0e1092e9478a Mon Sep 17 00:00:00 2001 From: Daniel Kroening Date: Wed, 8 Aug 2018 19:54:06 +0100 Subject: [PATCH 1/2] goto-cc: use result of our native compiler detection --- src/goto-cc/gcc_mode.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp index 07ebb10768d..e18870f656c 100644 --- a/src/goto-cc/gcc_mode.cpp +++ b/src/goto-cc/gcc_mode.cpp @@ -564,10 +564,13 @@ int gcc_modet::doit() config.ansi_c.mode=configt::ansi_ct::flavourt::VISUAL_STUDIO; debug() << "Enabling Visual Studio syntax" << eom; } - else if(config.this_operating_system()=="macos") - config.ansi_c.mode = configt::ansi_ct::flavourt::CLANG; else - config.ansi_c.mode=configt::ansi_ct::flavourt::GCC; + { + if(gcc_version.flavor == gcc_versiont::flavort::CLANG) + config.ansi_c.mode = configt::ansi_ct::flavourt::CLANG; + else + config.ansi_c.mode = configt::ansi_ct::flavourt::GCC; + } if(compiler.mode==compilet::ASSEMBLE_ONLY) compiler.object_file_extension="s"; From c0bcce779563f02dfd6fb05b360550313573ae5f Mon Sep 17 00:00:00 2001 From: Daniel Kroening Date: Wed, 8 Aug 2018 19:58:52 +0100 Subject: [PATCH 2/2] use clang as native compiler for goto-clang --- src/goto-cc/gcc_mode.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp index e18870f656c..33b59f8ffb7 100644 --- a/src/goto-cc/gcc_mode.cpp +++ b/src/goto-cc/gcc_mode.cpp @@ -61,6 +61,9 @@ static std::string compiler_name( base_name.find("goto-bcc")!=std::string::npos) return "bcc"; + if(base_name=="goto-clang") + return "clang"; + std::string::size_type pos=base_name.find("goto-gcc"); if(pos==std::string::npos ||