diff options
Diffstat (limited to 'source/compiler-core/slang-gcc-compiler-util.cpp')
| -rw-r--r-- | source/compiler-core/slang-gcc-compiler-util.cpp | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/source/compiler-core/slang-gcc-compiler-util.cpp b/source/compiler-core/slang-gcc-compiler-util.cpp index 5d72e675a..b5c359247 100644 --- a/source/compiler-core/slang-gcc-compiler-util.cpp +++ b/source/compiler-core/slang-gcc-compiler-util.cpp @@ -205,7 +205,9 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse #include "../slang.h" ^~~~~~~~~~~~ compilation terminated.*/ - + + /* g++: error: unrecognized command line option ‘-std=c++14’ */ + outDiagnostic.stage = Diagnostic::Stage::Compile; List<UnownedStringSlice> split; @@ -257,7 +259,9 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse // Check for special handling for clang (Can be Clang or clang apparently) if (split0.startsWith(UnownedStringSlice::fromLiteral("clang")) || - split0.startsWith(UnownedStringSlice::fromLiteral("Clang")) ) + split0.startsWith(UnownedStringSlice::fromLiteral("Clang")) || + split0 == UnownedStringSlice::fromLiteral("g++") || + split0 == UnownedStringSlice::fromLiteral("gcc")) { // Extract the type SLANG_RETURN_ON_FAIL(_parseSeverity(split[1].trim(), outDiagnostic.severity)); @@ -654,6 +658,22 @@ static SlangResult _parseGCCFamilyLine(const UnownedStringSlice& line, LineParse RefPtr<DownstreamCompiler> compiler; if (SLANG_SUCCEEDED(createCompiler(ExecutableLocation(path, "g++"), compiler))) { + // A downstream compiler for Slang must currently support C++14 - such that + // the prelude and generated code works. + // + // The first version of gcc that supports `-std=c++14` is 5.0 + // https://gcc.gnu.org/projects/cxx-status.html + // + // If could be argued to allow C/C++ compilations via older versions through an older version + // but that requires some more complex behavior, so we don't allow for now. + + auto desc = compiler->getDesc(); + if (desc.majorVersion < 5) + { + // If the version isn't 5 or higher, we don't add this version of the compiler. + return SLANG_OK; + } + set->addCompiler(compiler); } return SLANG_OK; |