Add clang attr to merged swift info in framework.bzl

rules/framework.bzl

@@ -561,7 +561,7 @@ def _create_swiftmodule(attrs):
         **kwargs
     )
 
-def _copy_swiftmodule(ctx, framework_files):
+def _copy_swiftmodule(ctx, framework_files, virtualize_frameworks):
     inputs = framework_files.inputs
     outputs = framework_files.outputs
 
@@ -578,18 +578,38 @@ def _copy_swiftmodule(ctx, framework_files):
         # original swift module/doc, so that swift can find it.
         swift_module = _create_swiftmodule(inputs)
 
+    # Setup the `clang` attr of the Swift module for non-vfs case this is required to have it locate the modulemap
+    # and headers correctly.
+    clang = None
+    if not virtualize_frameworks:
+        module_map = outputs.modulemaps[0] if outputs.modulemaps else None
+        clang = swift_common.create_clang_module(
+            module_map = module_map,
+            compilation_context = cc_common.create_compilation_context(
+                headers = depset(_compact(
+                    outputs.headers +
+                    outputs.private_headers +
+                    [module_map],
+                )),
+            ),
+        )
+
     return [
         # only add the swift module, the objc modulemap is already listed as a header,
         # and it will be discovered via the framework search path
-        swift_common.create_module(name = swiftmodule_name, swift = swift_module),
+        swift_common.create_module(
+            name = swiftmodule_name,
+            clang = clang,
+            swift = swift_module
+        ),
     ]
 
 def _get_merged_swift_info(ctx, framework_files, transitive_deps):
     swift_info_fields = {
         "swift_infos": [dep[SwiftInfo] for dep in transitive_deps if SwiftInfo in dep],
     }
     if framework_files.outputs.swiftmodule:
-        swift_info_fields["modules"] = _copy_swiftmodule(ctx, framework_files)
+        swift_info_fields["modules"] = _copy_swiftmodule(ctx, framework_files, virtualize_frameworks)
     return swift_common.create_swift_info(**swift_info_fields)
 
 def _merge_root_infoplists(ctx):