Skip to content

Commit 7f7062f

Browse files
[build] make build-toolchain.sh independent from channel version
1 parent 6abc607 commit 7f7062f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

utils/webassembly/build-toolchain.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ case $(uname -s) in
3434
esac
3535

3636
BUILD_HOST_TOOLCHAIN=1
37+
TOOLCHAIN_CHANNEL=${TOOLCHAIN_CHANNEL:-DEVELOPMENT}
3738

3839
while [ $# -ne 0 ]; do
3940
case "$1" in
@@ -51,9 +52,9 @@ done
5152
YEAR=$(date +"%Y")
5253
MONTH=$(date +"%m")
5354
DAY=$(date +"%d")
54-
TOOLCHAIN_NAME="swift-wasm-DEVELOPMENT-SNAPSHOT-${YEAR}-${MONTH}-${DAY}-a"
55+
TOOLCHAIN_NAME="swift-wasm-${TOOLCHAIN_CHANNEL}-SNAPSHOT-${YEAR}-${MONTH}-${DAY}-a"
5556

56-
PACKAGE_ARTIFACT="$SOURCE_PATH/swift-wasm-DEVELOPMENT-SNAPSHOT-${OS_SUFFIX}.tar.gz"
57+
PACKAGE_ARTIFACT="$SOURCE_PATH/swift-wasm-${TOOLCHAIN_CHANNEL}-SNAPSHOT-${OS_SUFFIX}.tar.gz"
5758

5859
HOST_TOOLCHAIN_DESTDIR=$SOURCE_PATH/host-toolchain-sdk
5960
DIST_TOOLCHAIN_DESTDIR=$SOURCE_PATH/dist-toolchain-sdk
@@ -163,11 +164,15 @@ embed_wasi_sysroot() {
163164
rm "$DIST_TOOLCHAIN_SDK/usr/lib/swift_static/wasi/wasm32/wasi.modulemap.bak"
164165
}
165166

167+
swift_version() {
168+
cat "$SOURCE_PATH/swift/CMakeLists.txt" | grep 'set(SWIFT_VERSION ' | sed -E 's/set\(SWIFT_VERSION "(.+)"\)/\1/'
169+
}
170+
166171
create_darwin_info_plist() {
167172
echo "-- Create Info.plist --"
168173
PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"
169174

170-
DARWIN_TOOLCHAIN_VERSION="5.5.${YEAR}${MONTH}${DAY}"
175+
DARWIN_TOOLCHAIN_VERSION="$(swift_version).${YEAR}${MONTH}${DAY}"
171176
BUNDLE_PREFIX="org.swiftwasm"
172177
DARWIN_TOOLCHAIN_BUNDLE_IDENTIFIER="${BUNDLE_PREFIX}.${YEAR}${MONTH}${DAY}"
173178
DARWIN_TOOLCHAIN_DISPLAY_NAME_SHORT="Swift for WebAssembly Snapshot"

0 commit comments

Comments
 (0)