test: trying Clang 17 with Clang modules instead of standard modules

zerodaycode · Aug 21, 2024 · 0148a50 · 0148a50
1 parent ed4ea79
commit 0148a50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/zork++/src/lib/cache/mod.rs b/zork++/src/lib/cache/mod.rs
@@ -374,7 +374,7 @@ mod clang {
         // Typically, the useful information will be in stderr for `clang++ -###` commands
         cache.compilers_metadata.clang = process_frontend_driver_info(&combined_output)?;
 
-        if cache.compilers_metadata.clang.major >= 17 {
+        if cache.compilers_metadata.clang.major > 17 {
             discover_modular_stdlibs(program_data, cache)?;
         }
 

diff --git a/zork++/src/lib/compiler/mod.rs b/zork++/src/lib/compiler/mod.rs
@@ -62,7 +62,7 @@ pub fn generate_commands_arguments<'a>(
 fn generate_modular_stdlibs_cmds<'a>(model: &'a ZorkModel<'a>, cache: &mut ZorkCache<'a>) {
     match model.compiler.cpp_compiler {
         CppCompiler::CLANG => {
-            if cache.compilers_metadata.clang.major >= 17 {
+            if cache.compilers_metadata.clang.major > 17 {
                 modules::generate_modular_cpp_stdlib_args(model, cache, StdLibMode::Cpp);
                 modules::generate_modular_cpp_stdlib_args(model, cache, StdLibMode::CCompat);
             }

diff --git a/zork++/src/lib/domain/flyweight_data.rs b/zork++/src/lib/domain/flyweight_data.rs
@@ -115,7 +115,7 @@ fn generate_clang_flyweight_args<'a>(
     let major = clang_metadata.major;
 
     compiler_flyweight_args.push_opt(program_data.compiler.stdlib_arg());
-    if major < 17 {
+    if major <= 17 {
         compiler_flyweight_args.push("-fimplicit-modules");
         compiler_flyweight_args.push(clang_args::implicit_module_map(out_dir));
     } else {