Skip to content

Commit 894faa6

Browse files
Install host toolchain without date in name
Installation host toolchain to directory with date breaks incremental builds after date changed because CMakeCache points old host-toolchain dir but the build-script installs toolchain in new date directory.
1 parent b104611 commit 894faa6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

utils/webassembly/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install-swift
1818
install-destdir=%(INSTALL_DESTDIR)s
1919
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;license;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers
2020
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;lld;llvm-ar;llvm-ranlib
21-
install-prefix=/%(TOOLCHAIN_NAME)s/usr
21+
install-prefix=/usr
2222

2323

2424
[preset: webassembly-host]

utils/webassembly/build-toolchain.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ build_host_toolchain() {
7373
--preset=$HOST_PRESET \
7474
--build-dir="$HOST_BUILD_DIR" \
7575
HOST_ARCHITECTURE="$(uname -m)" \
76-
INSTALL_DESTDIR="$HOST_TOOLCHAIN_DESTDIR" \
77-
TOOLCHAIN_NAME="$TOOLCHAIN_NAME"
76+
INSTALL_DESTDIR="$HOST_TOOLCHAIN_DESTDIR"
7877
}
7978

8079
build_target_toolchain() {
@@ -190,7 +189,8 @@ create_darwin_info_plist() {
190189
if [ ${BUILD_HOST_TOOLCHAIN} -eq 1 ]; then
191190
build_host_toolchain
192191
rm -rf "$DIST_TOOLCHAIN_DESTDIR"
193-
rsync -a "$HOST_TOOLCHAIN_DESTDIR/" "$DIST_TOOLCHAIN_DESTDIR"
192+
mkdir -p "$DIST_TOOLCHAIN_SDK"
193+
rsync -a "$HOST_TOOLCHAIN_DESTDIR/" "$DIST_TOOLCHAIN_SDK"
194194
fi
195195

196196
build_target_toolchain

0 commit comments

Comments
 (0)