Skip to content

Commit ceb74b8

Browse files
committed
Merge bitcoin/bitcoin#26998: depends: ensure we are appending to sqlite cflags
56a03f1 depends: ensure we are appending to sqlite cflags (fanquake) Pull request description: Otherwise we'll just override other flags passed in (i.e msan). Should fix https://cirrus-ci.com/task/6598922274078720?logs=ci#L3661. ACKs for top commit: achow101: ACK 56a03f1 TheCharlatan: ACK 56a03f1 Tree-SHA512: 5890018cfc5deaef18b0f01a3a0396f803e97f9a9785bf6873ef48bc13b74b644315f0f29cf11d3522964a6396f74e1f080bb4e412bc302956a651fed28b27df
2 parents c8cb622 + 56a03f1 commit ceb74b8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/sqlite.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $(package)_config_opts_freebsd=--with-pic
1212
$(package)_config_opts_netbsd=--with-pic
1313
$(package)_config_opts_openbsd=--with-pic
1414
$(package)_config_opts_debug=--enable-debug
15-
$(package)_cflags=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED
15+
$(package)_cflags+=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED
1616
$(package)_cflags+=-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE_DOESNT_MATCH_BLOBS
1717
$(package)_cflags+=-DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT
1818
endef

0 commit comments

Comments
 (0)