8000 [3.12] gh-128321: Set LIBS instead of LDFLAGS when checking sqlite3 r… · python/cpython@4ddee55 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4ddee55

Browse files
miss-islingtonzanieberlend-aasland
authored
[3.12] gh-128321: Set LIBS instead of LDFLAGS when checking sqlite3 requirements (GH-128322) (#128355)
(cherry picked from commit 81376fe) Co-authored-by: Zanie Blue <contact@zanie.dev> Co-authored-by: Erlend E. Aasland <erlend@python.org>
1 parent b22d0fc commit 4ddee55

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Set ``LIBS`` instead of ``LDFLAGS`` when checking if :mod:`sqlite3` library
2+
functions are available. This fixes the ordering of linked libraries during
3+
checks, which was incorrect when using a statically linked ``libsqlite3``.

configure

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4056,7 +4056,7 @@ WITH_SAVE_ENV([
40564056
dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
40574057
dnl hence CPPFLAGS instead of CFLAGS.
40584058
CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
4059-
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
4059+
LIBS="$LIBSQLITE3_LIBS $LIBS"
40604060
40614061
AC_CHECK_HEADER([sqlite3.h], [
40624062
have_sqlite3=yes

0 commit comments

Comments
 (0)
0