Skip to content

Commit 550478a

Browse files
authored
Merge pull request #21612 from johnno1962/os-suffux
Correct OS suffix for Linux
2 parents 75a9407 + 0a6de02 commit 550478a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

utils/build-toolchain

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ BUNDLE_PREFIX=
4141
case $(uname -s) in
4242
Darwin)
4343
SWIFT_PACKAGE=buildbot_osx_package,no_test
44+
OS_SUFFIX=osx
4445
;;
4546
Linux)
4647
SWIFT_PACKAGE=buildbot_linux,no_test
48+
OS_SUFFIX=linux
4749
;;
4850
*)
4951
echo "Unrecognised platform $(uname -s)"
@@ -98,8 +100,8 @@ MONTH=$(date +"%m")
98100
DAY=$(date +"%d")
99101
TOOLCHAIN_VERSION="swift-LOCAL-${YEAR}-${MONTH}-${DAY}-a"
100102
DARWIN_TOOLCHAIN_VERSION="0.0.${YEAR}${MONTH}${DAY}"
101-
ARCHIVE="${TOOLCHAIN_VERSION}-osx.tar.gz"
102-
SYM_ARCHIVE="${TOOLCHAIN_VERSION}-osx-symbols.tar.gz"
103+
ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}.tar.gz"
104+
SYM_ARCHIVE="${TOOLCHAIN_VERSION}-${OS_SUFFIX}-symbols.tar.gz"
103105
BUNDLE_PREFIX=${BUNDLE_PREFIX:?Please specify a bundle prefix}
104106
BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
105107
DISPLAY_NAME_SHORT="Local Swift Development Snapshot"

0 commit comments

Comments
 (0)