Skip to content

Commit 2e7e81e

Browse files
authored
Make utils/build-toolchain compatible with Xcode new build system. (#29025)
Xcode's new build system requires the Version entry in Info.plist to have a particular date-based format. Toolchains built using utils/build-toolchain now work with Xcode's new build system.
1 parent 4a1a17d commit 2e7e81e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

utils/build-toolchain

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ set -x
9898
YEAR=$(date +"%Y")
9999
MONTH=$(date +"%m")
100100
DAY=$(date +"%d")
101-
TOOLCHAIN_VERSION="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a"
101+
TOOLCHAIN_VERSION="5.0.${YEAR}${MONTH}${DAY}"
102+
TOOLCHAIN_NAME="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a"
102103
DARWIN_TOOLCHAIN_VERSION="0.0.${YEAR}${MONTH}${DAY}"
103-
ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}.tar.gz"
104-
SYM_ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}-symbols.tar.gz"
104+
ARCHIVE="${TOOLCHAIN_NAME}-${OS_SUFFIX}.tar.gz"
105+
SYM_ARCHIVE="${TOOLCHAIN_NAME}-${OS_SUFFIX}-symbols.tar.gz"
105106
BUNDLE_PREFIX=${BUNDLE_PREFIX:?Please specify a bundle prefix}
106107
BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
107108
DISPLAY_NAME_SHORT="Local Swift Development Snapshot"
108109
DISPLAY_NAME="${DISPLAY_NAME_SHORT} ${YEAR}-${MONTH}-${DAY}"
109-
TOOLCHAIN_NAME="${TOOLCHAIN_VERSION}"
110110

111111
SWIFT_INSTALLABLE_PACKAGE="${RESULT_DIR}/${ARCHIVE}"
112112
SWIFT_INSTALL_DIR="${RESULT_DIR}/swift-nightly-install"
@@ -126,5 +126,5 @@ DISTCC_FLAG="${DISTCC_FLAG}"
126126
darwin_toolchain_display_name="${DISPLAY_NAME}" \
127127
darwin_toolchain_display_name_short="${DISPLAY_NAME_SHORT}" \
128128
darwin_toolchain_xctoolchain_name="${TOOLCHAIN_NAME}" \
129-
darwin_toolchain_version="${DARWIN_TOOLCHAIN_VERSION}" \
129+
darwin_toolchain_version="${TOOLCHAIN_VERSION}" \
130130
darwin_toolchain_alias="Local"

0 commit comments

Comments
 (0)