================ @@ -131,13 +138,65 @@ def parseScript(test, preamble): script += preamble script += scriptInTest + has_std_module = False + has_std_compat_module = False + for module in modules: + if module == "std": + has_std_module = True + elif module == "std.compat": + has_std_compat_module = True + else: + script.insert( + 0, + f"echo \"The module '{module}' is not valid, use 'std' or 'std.compat'\"", + ) + script.insert(1, "false") + return script + + if modules: + # This flag is needed for both modules. + moduleCompileFlags.append("-fprebuilt-module-path=%T") + + # Building the modules needs to happen before the other script commands + # are executed. Therefore the commands are added to the front of the + # list. + if has_std_compat_module: + script.insert( + 0, + "%dbg(MODULE std.compat) %{cxx} %{flags} %{compile_flags} " + "-Wno-reserved-module-identifier -Wno-reserved-user-defined-literal " + "--precompile -o %T/std.compat.pcm -c %{module}/std.compat.cppm", + ) + moduleCompileFlags.append("%T/std.compat.pcm") + + # Make sure the std module is added before std.compat. + # Libc++'s std.compat module will depend on its std module. + # It is not known whether the compiler expects the modules in the order + # of their dependencies. However it's trivial to provide them in that + # order. ---------------- ldionne wrote:
@ChuanqiXu9 Is this required? We should know for sure here. https://github.com/llvm/llvm-project/pull/76246 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits