code cleanup

Author: owenv

Sources/SwiftBuildSupport/PIFBuilder.swift

@@ -362,14 +362,14 @@ fileprivate func buildAggregateProject(
                     // conflicts with those from "PACKAGE-TARGET:Foo-dynamic".
                     continue
                 }
-/*
+
                 if let resolvedModule = modulesGraph.module(for: target.name) {
                     guard modulesGraph.isInRootPackages(resolvedModule, satisfying: buildParameters.buildEnvironment) else {
                         // Disconnected target, possibly due to platform when condition that isn't satisfied
                         continue
                     }
                 }
-                */
+
                 aggregateProject[keyPath: allIncludingTestsTargetKeyPath].common.addDependency(
                     on: target.id,
                     platformFilters: [],

Sources/SwiftBuildSupport/PackagePIFBuilder.swift

@@ -504,7 +504,7 @@ public final class PackagePIFBuilder {
         for machoPlatform in [ProjectModel.BuildSettings.Platform.macOS, .macCatalyst, .iOS, .watchOS, .tvOS, .xrOS, .driverKit] {
             settings.platformSpecificSettings[machoPlatform]![.DYLIB_INSTALL_NAME_BASE]! = ["@rpath"]
         }
-        for elfPlatform in [ProjectModel.BuildSettings.Platform.linux, .android] {
+        for elfPlatform in [ProjectModel.BuildSettings.Platform.linux, .android, .openbsd, .freebsd] {
             // FIXME: Treating $ORIGIN as part of the soname is not really the right thing to do here
             settings.platformSpecificSettings[elfPlatform]![.DYLIB_INSTALL_NAME_BASE]! = ["$ORIGIN"]
         }

Sources/SwiftBuildSupport/PackagePIFProjectBuilder+Products.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+import TSCBasic
 import TSCUtility
 
 import struct Basics.AbsolutePath
@@ -1010,7 +1011,7 @@ extension PackagePIFProjectBuilder {
         }
 
         guard let unitTestModuleName = unitTestProduct.moduleName else {
-            fatalError()//throw StringError("")
+            throw StringError("Unit test product '\(unitTestProduct.name)' is missing a module name")
         }
 
         let name = "\(unitTestProduct.name)-test-runner"
@@ -1058,7 +1059,7 @@ extension PackagePIFProjectBuilder {
         }
 
         guard let unitTestGUID = unitTestProduct.pifTarget?.id else {
-            fatalError()
+            throw StringError("Unit test product '\(unitTestProduct.name)' is missing a PIF GUID")
         }
         self.project[keyPath: testRunnerTargetKeyPath].common.addDependency(
             on: unitTestGUID,