File tree Expand file tree Collapse file tree 5 files changed +11
-17
lines changed Expand file tree Collapse file tree 5 files changed +11
-17
lines changed Original file line number Diff line number Diff line change @@ -412,7 +412,8 @@ public final class PIFBuilder {
412
412
}
413
413
414
414
let packagePIFBuilderDelegate = PackagePIFBuilderDelegate (
415
- package : package
415
+ package : package ,
416
+ buildParameters: buildParameters,
416
417
)
417
418
let packagePIFBuilder = PackagePIFBuilder (
418
419
modulesGraph: self . graph,
@@ -484,9 +485,11 @@ public final class PIFBuilder {
484
485
485
486
fileprivate final class PackagePIFBuilderDelegate : PackagePIFBuilder . BuildDelegate {
486
487
let package : ResolvedPackage
488
+ let buildParameters : BuildParameters
487
489
488
- init ( package : ResolvedPackage ) {
490
+ init ( package : ResolvedPackage , buildParameters : BuildParameters ) {
489
491
self . package = package
492
+ self . buildParameters = buildParameters
490
493
}
491
494
492
495
var isRootPackage : Bool {
@@ -522,7 +525,8 @@ fileprivate final class PackagePIFBuilderDelegate: PackagePIFBuilder.BuildDelega
522
525
}
523
526
524
527
func configureProjectBuildSettings( _ buildSettings: inout ProjectModel . BuildSettings ) {
525
- /* empty */
528
+ // This is parity to the native build, But we should investigate what it would take to get this working on platforms.
529
+ buildSettings [ . CLANG_ENABLE_MODULES] = self . buildParameters. triple. isDarwin ( ) ? " YES " : " NO "
526
530
}
527
531
528
532
func configureSourceModuleBuildSettings( sourceModule: ResolvedModule , settings: inout ProjectModel . BuildSettings ) {
Original file line number Diff line number Diff line change @@ -1034,7 +1034,6 @@ extension ProjectModel.BuildSettings {
1034
1034
self [ . PRODUCT_NAME] = productName
1035
1035
self [ . PRODUCT_MODULE_NAME] = productName
1036
1036
self [ . PRODUCT_BUNDLE_IDENTIFIER] = " \( packageIdentity) . \( productName) " . spm_mangledToBundleIdentifier ( )
1037
- self [ . CLANG_ENABLE_MODULES] = " YES "
1038
1037
self [ . SWIFT_PACKAGE_NAME] = packageName ?? nil
1039
1038
1040
1039
if !createDylibForDynamicProducts {
Original file line number Diff line number Diff line change @@ -529,11 +529,6 @@ public final class PackagePIFBuilder {
529
529
}
530
530
531
531
settings [ . USE_HEADERMAP] = " NO "
532
- settings [ . OTHER_SWIFT_FLAGS] . lazilyInitializeAndMutate ( initialValue: [ " $(inherited) " ] ) { $0. append ( " -DXcode " ) }
533
-
534
- // TODO: Might be relevant to make customizable —— Paulo
535
- // (If we want to be extra careful with differences to the existing PIF in the SwiftPM.)
536
- settings [ . OTHER_CFLAGS] = [ " $(inherited) " , " -DXcode " ]
537
532
538
533
if !self . delegate. isRootPackage {
539
534
if self . suppressWarningsForPackageDependencies {
Original file line number Diff line number Diff line change @@ -115,7 +115,6 @@ extension PackagePIFProjectBuilder {
115
115
settings [ . PRODUCT_MODULE_NAME] = product. c99name
116
116
settings [ . PRODUCT_BUNDLE_IDENTIFIER] = " \( self . package . identity) . \( product. name) "
117
117
. spm_mangledToBundleIdentifier ( )
118
- settings [ . CLANG_ENABLE_MODULES] = " YES "
119
118
settings [ . SWIFT_PACKAGE_NAME] = mainModule. packageName
120
119
121
120
if mainModule. type == . test {
Original file line number Diff line number Diff line change @@ -34,31 +34,28 @@ extension Trait where Self == Testing.ConditionTrait {
34
34
/// Enabled only if toolchain support swift concurrency
35
35
public static var requiresSwiftConcurrencySupport : Self {
36
36
enabled ( " skipping because test environment doesn't support concurrency " ) {
37
- ( try ? UserToolchain . default) ! . supportsSwiftConcurrency ( )
37
+ ( try ? UserToolchain . default) ? . supportsSwiftConcurrency ( ) != nil
38
38
}
39
39
}
40
40
41
41
/// Enabled only if 'llvm-profdata' is available
42
42
public static var requiresLLVMProfData : Self {
43
43
disabled ( " skipping test because the `llvm-profdata` tool isn't available " ) {
44
- let toolPath = try ( try ? UserToolchain . default) !. getLLVMProf ( )
45
- return toolPath == nil
44
+ try ( try ? UserToolchain . default) ? . getLLVMProf ( ) == nil
46
45
}
47
46
}
48
47
49
48
/// Enabled only if 'llvm-cov' is available
50
49
public static var requiresLLVMCov : Self {
51
50
disabled ( " skipping test because the `llvm-cov` tool isn't available " ) {
52
- let toolPath = try ( try ? UserToolchain . default) !. getLLVMCov ( )
53
- return toolPath == nil
51
+ try ( try ? UserToolchain . default) ? . getLLVMCov ( ) == nil
54
52
}
55
53
}
56
54
57
55
/// Enabled only if 'swift-symbolgraph-extract' is available
58
56
public static var requiresSymbolgraphExtract : Self {
59
57
disabled ( " skipping test because the `swift-symbolgraph-extract` tools isn't available " ) {
60
- let toolPath = try ( try ? UserToolchain . default) !. getSymbolGraphExtract ( )
61
- return toolPath == nil
58
+ try ( try ? UserToolchain . default) ? . getSymbolGraphExtract ( ) == nil
62
59
}
63
60
}
64
61
You can’t perform that action at this time.
0 commit comments