Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions wasm-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ else
BUILD=emscripten
if $DEBUG
then
export COPTS="-O2 -g3 --no-wasm-opt"
export LOPTS=${LOPTS:-"-O2 -g3 --no-wasm-opt -sASSERTIONS=1"}
# clang default to O0 but specifying -O0 may trigger memory start address bug in emsdk
export COPTS="-g3 --no-wasm-opt"
export LOPTS=${LOPTS:-"-g3 --no-wasm-opt -sASSERTIONS=1"}
else
# DO NOT CHANGE COPTS - optimized wasm corruption fix
export COPTS="-O2 -g3 --no-wasm-opt"
Expand Down
7 changes: 5 additions & 2 deletions wasm-build/build-with-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ IMG_TAG="17.4_3.1.61.7bi"

export WORKSPACE=${GITHUB_WORKSPACE:-$(pwd)}

# normally would default to /workspace but that may cause trouble with debug paths in some IDE
export DOCKER_WORKSPACE=${DOCKER_WORKSPACE:-$WORKSPACE}

cd $(realpath ${WORKSPACE}/postgres-pglite)

[ -f ${BUILD_CONFIG:-postgres-pglite}/.buildconfig ] && cp ${BUILD_CONFIG:-postgres-pglite}/.buildconfig .buildconfig
Expand All @@ -32,8 +35,8 @@ fi
docker run $@ \
--rm \
--env-file .buildconfig \
--workdir=/workspace \
-v ${WORKSPACE}/postgres-pglite:/workspace:rw \
--workdir=${DOCKER_WORKSPACE} \
-v ${WORKSPACE}/postgres-pglite:${DOCKER_WORKSPACE}:rw \
-v ${WORKSPACE}/postgres-pglite/dist:/tmp/sdk/dist:rw \
$IMG_NAME:$IMG_TAG \
bash --noprofile --rcfile ${SDKROOT}/wasm32-bi-emscripten-shell.sh -ci "( ./wasm-build.sh ${WHAT:-\"contrib extra\"} $PROMPT"