diff --git a/utils/build-presets.ini b/utils/build-presets.ini index 0f96bd5f4273f..ff14d391f824a 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -2573,7 +2573,7 @@ no-assertions #===----------------------------------------------------------------------===# [preset: webassembly] - +no-assertions release cmake-c-launcher=%(C_CXX_LAUNCHER)s cmake-cxx-launcher=%(C_CXX_LAUNCHER)s @@ -2594,7 +2594,6 @@ extra-cmake-options= -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE -swift-enable-assertions=false llbuild swiftpm indexstore-db diff --git a/utils/webassembly/build-foundation.sh b/utils/webassembly/build-foundation.sh index 9550c975780bc..d78636009e0e2 100755 --- a/utils/webassembly/build-foundation.sh +++ b/utils/webassembly/build-foundation.sh @@ -3,7 +3,7 @@ set -ex DESTINATION_TOOLCHAIN=$1 SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)" -FOUNDATION_BUILD="$SOURCE_PATH/target-build/Ninja-ReleaseAssert/foundation-wasi-wasm32" +FOUNDATION_BUILD="$SOURCE_PATH/target-build/Ninja-Release/foundation-wasi-wasm32" mkdir -p $FOUNDATION_BUILD cd $FOUNDATION_BUILD diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh index eecc0117d907c..a0bee16b75c08 100755 --- a/utils/webassembly/build-toolchain.sh +++ b/utils/webassembly/build-toolchain.sh @@ -56,8 +56,8 @@ TARGET_TOOLCHAIN_SDK=$TARGET_TOOLCHAIN_DESTDIR/$TOOLCHAIN_NAME HOST_BUILD_ROOT=$SOURCE_PATH/host-build TARGET_BUILD_ROOT=$SOURCE_PATH/target-build -HOST_BUILD_DIR=$HOST_BUILD_ROOT/Ninja-ReleaseAssert -TARGET_BUILD_DIR=$TARGET_BUILD_ROOT/Ninja-ReleaseAssert +HOST_BUILD_DIR=$HOST_BUILD_ROOT/Ninja-Release +TARGET_BUILD_DIR=$TARGET_BUILD_ROOT/Ninja-Release # Avoid clang headers symlink issues mkdir -p $HOST_TOOLCHAIN_SDK/usr/lib/clang/10.0.0 diff --git a/utils/webassembly/build-xctest.sh b/utils/webassembly/build-xctest.sh index fe93f244ce0b3..103edd0fcf6df 100755 --- a/utils/webassembly/build-xctest.sh +++ b/utils/webassembly/build-xctest.sh @@ -3,7 +3,7 @@ set -ex DESTINATION_TOOLCHAIN=$1 SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)" -BUILD_DIR="$SOURCE_PATH/target-build/Ninja-ReleaseAssert/xctest-wasi-wasm32" +BUILD_DIR="$SOURCE_PATH/target-build/Ninja-Release/xctest-wasi-wasm32" mkdir -p $BUILD_DIR cd $BUILD_DIR diff --git a/utils/webassembly/ci.sh b/utils/webassembly/ci.sh index 6f9e14f10ab55..8c9c5c8c80a99 100755 --- a/utils/webassembly/ci.sh +++ b/utils/webassembly/ci.sh @@ -23,7 +23,7 @@ esac BUILD_SCRIPT=$UTILS_PATH/build-toolchain.sh RUN_TEST_BIN=$SWIFT_PATH/utils/run-test -TARGET_BUILD_DIR=$SOURCE_PATH/target-build/Ninja-ReleaseAssert +TARGET_BUILD_DIR=$SOURCE_PATH/target-build/Ninja-Release $DEPENDENCIES_SCRIPT