Skip to content

Commit f0d4148

Browse files
update makefile
1 parent de00ff0 commit f0d4148

9 files changed

+36
-5064
lines changed

Makefile

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# dependencies
2-
SQLITE_VERSION = version-3.46.0
2+
# TODO this should be 3.46.0, but there are build errors
3+
SQLITE_VERSION = version-3.44.0
34
SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION}
45

56
EXTENSION_FUNCTIONS = extension-functions.c
@@ -170,15 +171,22 @@ tmp/obj/dist/%.o: %.c
170171
mkdir -p tmp/obj/dist
171172
$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
172173

174+
# Use Linker true command switch which differs per OS
175+
ifeq ($(shell uname), Darwin)
176+
TRUE_CMD := /usr/bin/true
177+
else
178+
TRUE_CMD := /bin/true
179+
endif
180+
173181
$(RS_DEBUG_BC): FORCE
174182
mkdir -p tmp/bc/dist
175183
cd $(RS_LIB_DIR); \
176-
RUSTFLAGS="--emit=llvm-bc -C linker=/bin/true" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
184+
RUSTFLAGS="--emit=llvm-bc -C linker=${TRUE_CMD}" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
177185

178186
$(RS_RELEASE_BC): FORCE
179187
mkdir -p tmp/bc/dist
180188
cd $(RS_LIB_DIR); \
181-
RUSTFLAGS="--emit=llvm-bc -C linker=/bin/true" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
189+
RUSTFLAGS="--emit=llvm-bc -C linker=${TRUE_CMD}" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target $(RS_WASM_TGT)
182190

183191

184192
## debug
@@ -194,7 +202,7 @@ debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(E
194202
$(EMCC) $(EMFLAGS_DEBUG) \
195203
$(EMFLAGS_INTERFACES) \
196204
$(EMFLAGS_LIBRARIES) \
197-
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
205+
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
198206
$(OBJ_FILES_DEBUG) *.o -o $@
199207

200208
debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
@@ -203,7 +211,7 @@ debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTION
203211
$(EMFLAGS_INTERFACES) \
204212
$(EMFLAGS_LIBRARIES) \
205213
$(EMFLAGS_ASYNCIFY_DEBUG) \
206-
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
214+
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
207215
$(OBJ_FILES_DEBUG) *.o -o $@
208216

209217
## Debug FTS builds
@@ -233,6 +241,7 @@ debug/wa-sqlite-jspi.mjs: $(OBJ_FILES_DEBUG) $(JSFILES) $(EXPORTED_FUNCTIONS) $(
233241
$(EMFLAGS_INTERFACES) \
234242
$(EMFLAGS_LIBRARIES) \
235243
$(EMFLAGS_JSPI) \
244+
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
236245
$(OBJ_FILES_DEBUG) -o $@
237246

238247
## dist
@@ -248,7 +257,7 @@ dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(E
248257
$(EMCC) $(EMFLAGS_DIST) \
249258
$(EMFLAGS_INTERFACES) \
250259
$(EMFLAGS_LIBRARIES) \
251-
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
260+
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
252261
$(OBJ_FILES_DIST) -o $@
253262

254263
dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
@@ -257,6 +266,7 @@ dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTION
257266
$(EMFLAGS_INTERFACES) \
258267
$(EMFLAGS_LIBRARIES) \
259268
$(EMFLAGS_ASYNCIFY_DIST) \
269+
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
260270
$(OBJ_FILES_DIST) -o $@
261271

262272
dist/wa-sqlite-jspi.mjs: $(OBJ_FILES_DIST) $(JSFILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
@@ -267,3 +277,5 @@ dist/wa-sqlite-jspi.mjs: $(OBJ_FILES_DIST) $(JSFILES) $(EXPORTED_FUNCTIONS) $(EX
267277
$(EMFLAGS_JSPI) \
268278
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
269279
$(OBJ_FILES_DIST) -o $@
280+
281+
FORCE:

0 commit comments

Comments
 (0)