From 23132573c2c0511dffbdf0e22cb24e7806ebdf10 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Wed, 8 Feb 2023 09:14:41 +0800 Subject: [PATCH 1/2] Moves linker flags to xcconfig --- NetNewsWire.xcodeproj/project.pbxproj | 30 ------------------- .../NetNewsWire_ios_target_common.xcconfig | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 30d2d8b1a..a37792cfa 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -4625,11 +4625,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1768140A2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Debug; }; @@ -4637,11 +4632,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1768140A2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Release; }; @@ -4663,11 +4653,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Debug; }; @@ -4675,11 +4660,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Release; }; @@ -4687,11 +4667,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Debug; }; @@ -4699,11 +4674,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */; buildSettings = { - OTHER_LDFLAGS = ( - "$(inherited)", - "-Xlinker", - "-no_application_extension", - ); }; name = Release; }; diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index 0a90fb07f..c33b46ab5 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -11,3 +11,4 @@ GCC_C_LANGUAGE_STANDARD = gnu11; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1,2 IPHONEOS_DEPLOYMENT_TARGET = 15.0 +OTHER_LDFLAGS = $(inherited) -Xlinker -no_application_extension From ea406df514833f68f84db6fecd27f91a5ba52dd5 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Wed, 8 Feb 2023 09:17:34 +0800 Subject: [PATCH 2/2] VerifyNoBS runs on all iOS builds --- NetNewsWire.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index a37792cfa..4c76c5d00 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -3569,7 +3569,7 @@ }; 515D50802326D02600EE1167 /* Run Script: Verify No Build Settings */ = { isa = PBXShellScriptBuildPhase; - buildActionMask = 8; + buildActionMask = 12; files = ( ); inputFileListPaths = ( @@ -3581,7 +3581,7 @@ ); outputPaths = ( ); - runOnlyForDeploymentPostprocessing = 1; + runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 buildscripts/VerifyNoBS.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n\n\nif [ $? -ne 0 ]\nthen\n echo \"error: Build Setting were found in the project.pbxproj file. Most likely you didn't intend to change this file and should revert it.\"\n exit 1\nfi\n"; };