Merge pull request #1878 from swiftwasm/katei/suppress-wasm-ld-warnings-again

Disable assertion for both target and host toolchain

Author: MaxDesiatov

Diff for: 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 for: 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 for: 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 for: 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 for: 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