Skip to content

Disable assertion for both target and host toolchain #1878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Disable assertion for both target and host toolchain #1878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -2594,7 +2594,6 @@ extra-cmake-options=
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE

swift-enable-assertions=false
llbuild
swiftpm
indexstore-db
Expand Down
2 changes: 1 addition & 1 deletion utils/webassembly/build-foundation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions utils/webassembly/build-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/webassembly/build-xctest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/webassembly/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down