Skip to content

Commit 05d3ff7

Browse files
authored
Merge pull request #72629 from rintaro/macros-no-xcodeplugin
[Macros] Remove plugin related flags from toolchain Info.plist
2 parents b620916 + 5d48a5a commit 05d3ff7

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

utils/build-script-impl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3293,8 +3293,6 @@ function build_and_test_installable_package() {
32933293
COMPATIBILITY_VERSION=2
32943294
COMPATIBILITY_VERSION_DISPLAY_STRING="Xcode 8.0"
32953295
DARWIN_TOOLCHAIN_CREATED_DATE="$(date -u +'%a %b %d %T GMT %Y')"
3296-
XCODE_DEFAULT_TOOLCHAIN_PLUGIN_SERVER_DESCRIPTOR='$(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/host/plugins#$(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift-plugin-server'
3297-
XCODE_DEFAULT_TOOLCHAIN_LOCAL_PLUGIN_SERVER_DESCRIPTOR='$(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/local/lib/swift/host/plugins#$(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift-plugin-server'
32983296

32993297
SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME="YES"
33003298
if [[ "${DARWIN_TOOLCHAIN_REQUIRE_USE_OS_RUNTIME}" -eq "1" ]]; then
@@ -3330,8 +3328,6 @@ function build_and_test_installable_package() {
33303328
call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_DEVELOPMENT_TOOLCHAIN string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
33313329
call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME string '${SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
33323330

3333-
call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:OTHER_SWIFT_FLAGS string '\$(inherited) -Xfrontend -external-plugin-path -Xfrontend ${XCODE_DEFAULT_TOOLCHAIN_PLUGIN_SERVER_DESCRIPTOR} -Xfrontend -external-plugin-path -Xfrontend ${XCODE_DEFAULT_TOOLCHAIN_LOCAL_PLUGIN_SERVER_DESCRIPTOR}'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
3334-
33353331
call chmod a+r "${DARWIN_TOOLCHAIN_INFO_PLIST}"
33363332

33373333
if [[ "${DARWIN_TOOLCHAIN_APPLICATION_CERT}" ]] ; then

0 commit comments

Comments
 (0)