commit bf1df4fdf8881d0ff50a552b99c7ffb3afad66b7
author Mishal Shah <shahmishal@users.noreply.github.com> Tue Dec 18 19:57:48 2018 -0800
committer GitHub <noreply@github.com> Tue Dec 18 19:57:48 2018 -0800
tree 0c24a4aeab68fe158162f250ca68afba24e729d4
parent da2e8a97c5ae7cba7926a7f8c36b62873d186fe4
parent ba2233d24830d9c20caf6bea2b4a6ed852023a46

Merge pull request #21430 from apple/shahmishal/update-toolchain-plist

Update the toolchain plist by moving SWIFT_USE_DEVELOPMENT_TOOLCHAIN_…

utils/build-script-impl

diff --git a/utils/build-script-impl b/utils/build-script-impl
index 9ded899..c438257 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -3774,8 +3774,7 @@
           call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_DISABLE_REQUIRED_ARCLITE string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
           call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_LINK_OBJC_RUNTIME string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
           call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_DEVELOPMENT_TOOLCHAIN string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
-          call ${PLISTBUDDY_BIN} -c "Add DefaultBuildSettings dict" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
-          call ${PLISTBUDDY_BIN} -c "Add DefaultBuildSettings:SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
+          call ${PLISTBUDDY_BIN} -c "Add OverrideBuildSettings:SWIFT_USE_DEVELOPMENT_TOOLCHAIN_RUNTIME string 'YES'" "${DARWIN_TOOLCHAIN_INFO_PLIST}"
 
           call chmod a+r "${DARWIN_TOOLCHAIN_INFO_PLIST}"