================
@@ -132,13 +154,62 @@ def parseScript(test, preamble):
script += scriptInTest
# Add compile flags specified with ADDITIONAL_COMPILE_FLAGS.
+ # Modules need to be build with the same compilation flags as the
+ # test. So add these flags before adding the modules.
substitutions = [
(s, x + " " + " ".join(additionalCompileFlags))
if s == "%{compile_flags}"
else (s, x)
for (s, x) in substitutions
]
+ if modules:
+ _validateModuleDependencies(modules)
+
+ # This flag is needed for both modules.
+ #moduleCompileFlags.append("-fprebuilt-module-path=%T")
+
+ # The moduleCompileFlags are added to the %{compile_flags}, but
+ # the modules need should be built without these flags. So
+ # expand the compile_flags and add the expanded value to the
+ # build script.
+ compileFlags = _getSubstitution("%{compile_flags}", test.config)
+
+ # 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 "std.compat" in modules:
+ script.insert(
+ 0,
+ "%dbg(MODULE std.compat) %{cxx} %{flags} "
+ f"{compileFlags} "
+ "-Wno-reserved-module-identifier
-Wno-reserved-user-defined-literal "
+ "--precompile -o %T/std.compat.pcm -c
%{module}/std.compat.cppm",
+ )
+
moduleCompileFlags.append("-fmodule-file=std.compat=%T/std.compat.pcm
%T/std.compat.pcm")
----------------
ldionne wrote:
Let's do this since those are two separate compiler flags:
```suggestion
moduleCompileFlags.extend(["-fmodule-file=std.compat=%T/std.compat.pcm",
"%T/std.compat.pcm"])
```
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
