database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

Teach ext/wasm/GNUmakefile to use tool/emcc.sh and fix a syntax error in tool/emcc.sh.in. Work around a JimTCL incompatibility in tool/mkshellc.tcl.

Browse Source 
FossilOrigin-Name: 24e0f6ecc67615a2a8c2df08aa47a782cf692fb1a5a59246eab83c0232e78edc
This commit is contained in:
stephan
2024-10-22 12:56:00 +00:00
parent 1e38a9cc1a
commit 6ac6bedc80
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ext/wasm/GNUmakefile
View File

@ -38,7 +38,7 @@
########################################################################
default: all
#default: quick
SHELL := $(firstword $(wildcard /usr/local/bin/bash /usr/bin/bash /bin/bash))
SHELL := $(firstword $(shell which bash) $(wildcard /usr/local/bin/bash /usr/bin/bash /bin/bash))
ifeq (,$(SHELL))
$(error Cannot find the bash shell)
endif
@ -174,14 +174,9 @@ ifeq (1,$(MAKING_CLEAN))
emcc.bin := echo
emcc.version := unknown
else
emcc.bin := $(shell which emcc 2>/dev/null)
ifeq (,$(emcc.bin))
ifneq (,$(EMSDK_HOME))
emcc.bin := $(wildcard $(EMSDK_HOME)/upstream/emscripten/emcc)
endif
ifeq (,$(emcc.bin))
$(error Cannot find emcc in path.)
endif
emcc.bin := $(dir.tool)/emcc.sh
ifeq (,$(wildcard $(emcc.bin)))
$(error Configure script did not find emcc.)
endif
emcc.version := $(shell $(emcc.bin) --version | sed -n 1p | sed -e 's/^.* \([3-9][^ ]*\) .*$$/\1/;')
$(info using emcc version [$(emcc.version)])