Skip to content

Commit 5d48a5a

Browse files
committed
[Macros] Remove plugin related flags from toolchain Info.plist
`-external-plugin-path` flags pointing XcodeDefault.xctoolchain were needed to use macro plugins in Apple SDK. But since Apple macro plugins are not in `.xctoolchain` anymore, these flags are useless. rdar://125498074
1 parent b019fd0 commit 5d48a5a

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
@@ -3292,8 +3292,6 @@ function build_and_test_installable_package() {
32923292
COMPATIBILITY_VERSION=2
32933293
COMPATIBILITY_VERSION_DISPLAY_STRING="Xcode 8.0"
32943294
DARWIN_TOOLCHAIN_CREATED_DATE="$(date -u +'%a %b %d %T GMT %Y')"
3295-
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'
3296-
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'
32973295

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

3332-
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}"
3333-
33343330
call chmod a+r "${DARWIN_TOOLCHAIN_INFO_PLIST}"
33353331

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

0 commit comments

Comments
 (0)