liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'fix-wasm-generation' into 'main'

Browse Source 
The wasm_build.sh script is now more resilient to failures in finding llvm-dwarfdump

See merge request veilid/veilid!212
This commit is contained in:
Christien Rioux 2023-10-07 19:05:35 +00:00
commit e939e2976f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
veilid-wasm/wasm_build.sh
View File

@ -14,14 +14,14 @@ if [ -f /usr/local/opt/llvm/bin/llvm-dwarfdump ]; then
DWARFDUMP=/usr/local/opt/llvm/bin/llvm-dwarfdump DWARFDUMP=/usr/local/opt/llvm/bin/llvm-dwarfdump
elif [ -f /opt/homebrew/llvm/bin/llvm-dwarfdump ]; then elif [ -f /opt/homebrew/llvm/bin/llvm-dwarfdump ]; then
DWARFDUMP=/opt/homebrew/llvm/bin/llvm-dwarfdump DWARFDUMP=/opt/homebrew/llvm/bin/llvm-dwarfdump
else else
DWARFDUMP=`which llvm-dwarfdump` # some systems may have the major LLVM version suffixed on the LLVM binaries - and we need `true` at the end because the whole script will fail with a nonzero return if something goes wrong here
DWARFDUMP=`which llvm-dwarfdump || find ${PATH//:/\/ } -name 'llvm-dwarfdump*' 2>/dev/null | head -n1 || true`
if [[ "${DWARFDUMP}" == "" ]]; then if [[ "${DWARFDUMP}" == "" ]]; then
echo llvm-dwarfdump not found echo "llvm-dwarfdump not found"
fi fi
fi fi
if [[ "$1" == "release" ]]; then if [[ "$1" == "release" ]]; then
OUTPUTDIR=../target/wasm32-unknown-unknown/release/pkg OUTPUTDIR=../target/wasm32-unknown-unknown/release/pkg
INPUTDIR=../target/wasm32-unknown-unknown/release INPUTDIR=../target/wasm32-unknown-unknown/release