Default toolchain install location changed to /Library

shahmishal · shahmishal · commit 1cc28c769e92 · 2015-11-30T14:50:52.000-08:00
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -2133,7 +2133,7 @@ if [[ "${INSTALLABLE_PACKAGE}" ]] ; then
       echo "-- Create Info.plist --"
       PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"
 
-      DARWIN_TOOLCHAIN_INSTALL_LOCATION="~/Library/Developer/Toolchains/${DARWIN_TOOLCHAIN_NAME}.xctoolchain"
+      DARWIN_TOOLCHAIN_INSTALL_LOCATION="/Library/Developer/Toolchains/${DARWIN_TOOLCHAIN_NAME}.xctoolchain"
       DARWIN_TOOLCHAIN_INFO_PLIST="${INSTALL_DESTDIR}/${TOOLCHAIN_PREFIX}/Info.plist"
       DARWIN_TOOLCHAIN_REPORT_URL="https://bugs.swift.org/"
 
diff --git a/utils/darwin-installer-scripts/postinstall b/utils/darwin-installer-scripts/postinstall
@@ -13,4 +13,4 @@
 
 INSTALLED_TOOLCHAIN=$2
 
-ln -fs "${INSTALLED_TOOLCHAIN}" "${INSTALLED_TOOLCHAIN%/*}/swift-latest.xctoolchain"
+ln -fs "${INSTALLED_TOOLCHAIN}" "${INSTALLED_TOOLCHAIN%/*}/swift-latest"

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`
`14`	`14`	`INSTALLED_TOOLCHAIN=$2`
`15`	`15`
`16`		`-ln -fs "${INSTALLED_TOOLCHAIN}" "${INSTALLED_TOOLCHAIN%/*}/swift-latest.xctoolchain"`
	`16`	`+ln -fs "${INSTALLED_TOOLCHAIN}" "${INSTALLED_TOOLCHAIN%/*}/swift-latest"`