Skip to content

Commit 0d509ba

Browse files
committed
Merge bitcoin#29527: depends: add -g to DEBUG=1 flags
84fbf9b depends: remove -g from sqlite debug flags (fanquake) eef51af depends: add -g to DEBUG=1 flags (fanquake) Pull request description: Add `-g` to the base DEBUG=1 flags in depends. Avoids the need to specify it per-package. More alignment with `--enable-debug` behaviour in configure. We also want to align the optimization flags, currently -O1 vs -O0, however that can be it's own PR. ACKs for top commit: theuni: ACK 84fbf9b Tree-SHA512: 1ee98ba0c13e4b80bb87632658b4f53ce49c73e0e7712990c30da60deca4a349a744232f2d78f243dee9a07f5b9b70f9c2c4ae34082c34ae51b37b054fac61fd
2 parents 5aff45a + 84fbf9b commit 0d509ba

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

Diff for: depends/hosts/darwin.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ endif
105105
darwin_release_CFLAGS=-O2
106106
darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
107107

108-
darwin_debug_CFLAGS=-O1
108+
darwin_debug_CFLAGS=-O1 -g
109109
darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
110110

111111
darwin_cmake_system=Darwin

Diff for: depends/hosts/linux.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ endif
1010
linux_release_CFLAGS=-O2
1111
linux_release_CXXFLAGS=$(linux_release_CFLAGS)
1212

13-
linux_debug_CFLAGS=-O1
13+
linux_debug_CFLAGS=-O1 -g
1414
linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)
1515

1616
linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_ENABLE_DEBUG_MODE=1

Diff for: depends/hosts/mingw32.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif
1414
mingw32_release_CFLAGS=-O2
1515
mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)
1616

17-
mingw32_debug_CFLAGS=-O1
17+
mingw32_debug_CFLAGS=-O1 -g
1818
mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
1919

2020
mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC

Diff for: depends/packages/sqlite.mk

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ define $(package)_set_vars
88
$(package)_config_opts=--disable-shared --disable-readline --disable-dynamic-extensions --enable-option-checking
99
$(package)_config_opts+= --disable-rtree --disable-fts4 --disable-fts5
1010
# We avoid using `--enable-debug` because it overrides CFLAGS, a behavior we want to prevent.
11-
$(package)_cflags_debug += -g
1211
$(package)_cppflags_debug += -DSQLITE_DEBUG
1312
$(package)_cppflags+=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED
1413
$(package)_cppflags+=-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE_DOESNT_MATCH_BLOBS

0 commit comments

Comments
 (0)