From 5745a2fe944dca5612b31c099101914d6c60b223 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 14 Dec 2023 07:42:44 +0200
Subject: Allow enabling C++ modules for C++20 and later std.cxx values

---
 tests/cc/modules/common.testscript | 10 +++++-----
 tests/cc/preprocessed/testscript   |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/cc/modules/common.testscript b/tests/cc/modules/common.testscript
index f430f8a..9883e42 100644
--- a/tests/cc/modules/common.testscript
+++ b/tests/cc/modules/common.testscript
@@ -25,11 +25,11 @@ cxx.features.symexport = true
 # Note: there are some issues with enabling modules in Apple Clang 15 so
 # for now we only test vanilla Clang.
 #
-if ($cxx.id == 'gcc'                                    || \
-    ($cxx.id == 'msvc' && ($cxx.version.major > 19 ||      \
-                           ($cxx.version.major == 19 &&    \
-                            $cxx.version.minor >= 36))) || \
-    ($cxx.id == 'clang' && $cxx.version.major >= 16))
+if (($cxx.id == 'gcc'   && $cxx.version.major >= 11)     || \
+    ($cxx.id == 'clang' && $cxx.version.major >= 16)     || \
+    ($cxx.id == 'msvc'  && ($cxx.version.major > 19 ||      \
+                            ($cxx.version.major == 19 &&    \
+                             $cxx.version.minor >= 36))))
   cxx.features.modules = true
 
 using cxx
diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript
index 507a92d..53e7755 100644
--- a/tests/cc/preprocessed/testscript
+++ b/tests/cc/preprocessed/testscript
@@ -98,6 +98,7 @@ $* &test* <<EOI 2>>EOE != 0
   exe{test}: cxx{test}
   EOI
   error: modules support required by cxx{test}
+    info: consider enabling modules with cxx.features.modules=true in root.build
   EOE
 
 : all
-- 
cgit v1.1