Only define these for Swift modules

Author: matthewseaman

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Modules.swift

@@ -596,17 +596,19 @@ extension PackagePIFProjectBuilder {
             settings[.COREML_COMPILER_CONTAINER] = "swift-package"
         }
 
-        // Leave an explicit indicator regarding whether we are generating a Bundle.module accessor.
-        // This will be read by the #bundle macro defined in Foundation.
-        if !shouldGenerateBundleAccessor {
-            // No resources, so explicitly indicate that.
-            // #bundle will then produce an error about there being no resources.
-            settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE") }
-        } else if !(resourceBundleName?.isEmpty ?? true) {
-            // We have an explicit resource bundle via Bundle.module.
-            // #bundle should call into that.
-            settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE") }
-        } // else we won't set either of those and just let #bundle point to the same bundle as the source code.
+        if sourceModule.usesSwift {
+            // Leave an explicit indicator regarding whether we are generating a Bundle.module accessor.
+            // This will be read by the #bundle macro defined in Foundation.
+            if !shouldGenerateBundleAccessor {
+                // No resources, so explicitly indicate that.
+                // #bundle will then produce an error about there being no resources.
+                settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE") }
+            } else if !(resourceBundleName?.isEmpty ?? true) {
+                // We have an explicit resource bundle via Bundle.module.
+                // #bundle should call into that.
+                settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE") }
+            } // else we won't set either of those and just let #bundle point to the same bundle as the source code.
+        }
 
         if desiredModuleType == .macro {
             settings[.SWIFT_IMPLEMENTS_MACROS_FOR_MODULE_NAMES] = [sourceModule.c99name]

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift

@@ -267,8 +267,11 @@ extension PackagePIFProjectBuilder {
 
                 if result.shouldGenerateBundleAccessor {
                     settings[.GENERATE_RESOURCE_ACCESSORS] = "YES"
-                    settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE") }
-                } else {
+
+                    if mainModule.usesSwift {
+                        settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE") }
+                    }
+                } else if mainModule.usesSwift {
                     settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS].lazilyInitializeAndMutate(initialValue: ["$(inherited)"]) { $0.append("SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE") }
                 }
                 if result.shouldGenerateEmbedInCodeAccessor {

Sources/XCBuildSupport/PIFBuilder.swift

@@ -488,21 +488,26 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
             settings[.GENERATE_INFOPLIST_FILE] = "YES"
         }
 
+        var isSwiftModule = false
         if let clangTarget = mainTarget.underlying as? ClangModule {
             // Let the target itself find its own headers.
             settings[.HEADER_SEARCH_PATHS, default: ["$(inherited)"]].append(clangTarget.includeDir.pathString)
             settings[.GCC_C_LANGUAGE_STANDARD] = clangTarget.cLanguageStandard
             settings[.CLANG_CXX_LANGUAGE_STANDARD] = clangTarget.cxxLanguageStandard
         } else if let swiftTarget = mainTarget.underlying as? SwiftModule {
+            isSwiftModule = true
             try settings.addSwiftVersionSettings(target: swiftTarget, parameters: self.parameters)
             settings.addCommonSwiftSettings(package: self.package, target: mainTarget, parameters: self.parameters)
         }
 
         if let resourceBundle = addResourceBundle(for: mainTarget, in: pifTarget) {
             settings[.PACKAGE_RESOURCE_BUNDLE_NAME] = resourceBundle
             settings[.GENERATE_RESOURCE_ACCESSORS] = "YES"
-            settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE")
-        } else {
+
+            if isSwiftModule {
+                settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE")
+            }
+        } else if isSwiftModule {
             settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE")
         }
 
@@ -657,6 +662,7 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
         let moduleMapFileContents: String?
         let shouldImpartModuleMap: Bool
 
+        var isSwiftModule = false
         if let clangTarget = target.underlying as? ClangModule {
             // Let the target itself find its own headers.
             settings[.HEADER_SEARCH_PATHS, default: ["$(inherited)"]].append(clangTarget.includeDir.pathString)
@@ -683,6 +689,7 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
                 shouldImpartModuleMap = false
             }
         } else if let swiftTarget = target.underlying as? SwiftModule {
+            isSwiftModule = true
             try settings.addSwiftVersionSettings(target: swiftTarget, parameters: self.parameters)
 
             // Generate ObjC compatibility header for Swift library targets.
@@ -732,9 +739,11 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
         if let resourceBundle = addResourceBundle(for: target, in: pifTarget) {
             settings[.PACKAGE_RESOURCE_BUNDLE_NAME] = resourceBundle
             settings[.GENERATE_RESOURCE_ACCESSORS] = "YES"
-            settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE")
+            if isSwiftModule {
+                settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE")
+            }
             impartedSettings[.EMBED_PACKAGE_RESOURCE_BUNDLE_NAMES, default: ["$(inherited)"]].append(resourceBundle)
-        } else {
+        } else if isSwiftModule {
             settings[.SWIFT_ACTIVE_COMPILATION_CONDITIONS, default: ["$(inherited)"]].append("SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE")
         }