Skip to content

Commit f2cc565

Browse files
authored
[3.12] gh-128354: Consistently use LIBS over LDFLAGS in library build… (#128466)
(cherry picked from commit b75ed95)
1 parent d56e502 commit f2cc565

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

configure

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3630,7 +3630,7 @@ AS_VAR_IF([have_uuid], [missing], [
36303630
], [
36313631
WITH_SAVE_ENV([
36323632
CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
3633-
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
3633+
LIBS="$LIBS $LIBUUID_LIBS"
36343634
AC_CHECK_HEADERS([uuid/uuid.h], [
36353635
PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
36363636
PY_CHECK_LIB([uuid], [uuid_generate_time_safe],
@@ -3857,7 +3857,7 @@ AS_VAR_IF([have_libffi], [missing], [
38573857
PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
38583858
WITH_SAVE_ENV([
38593859
CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
3860-
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
3860+
LIBS="$LIBS $LIBFFI_LIBS"
38613861
AC_CHECK_HEADER([ffi.h], [
38623862
AC_CHECK_LIB([ffi], [ffi_call], [
38633863
have_libffi=yes
@@ -3888,8 +3888,8 @@ AS_VAR_IF([have_libffi], [yes], [
38883888
AS_VAR_IF([ac_cv_lib_dl_dlopen], [yes], [AS_VAR_APPEND([LIBFFI_LIBS], [" -ldl"])])
38893889
38903890
WITH_SAVE_ENV([
3891-
CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
3892-
LDFLAGS="$LIBFFI_LIBS $LDFLAGS"
3891+
CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
3892+
LIBS="$LIBS $LIBFFI_LIBS"
38933893
38943894
PY_CHECK_FUNC([ffi_prep_cif_var], [@%:@include <ffi.h>])
38953895
PY_CHECK_FUNC([ffi_prep_closure_loc], [@%:@include <ffi.h>])
@@ -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-
LIBS="$LIBSQLITE3_LIBS $LIBS"
4059+
LIBS="$LIBS $LIBSQLITE3_LIBS"
40604060
40614061
AC_CHECK_HEADER([sqlite3.h], [
40624062
have_sqlite3=yes
@@ -4159,7 +4159,7 @@ AS_CASE([$ac_sys_system],
41594159

41604160
WITH_SAVE_ENV([
41614161
CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
4162-
LIBS="$TCLTK_LIBS $LDFLAGS"
4162+
LIBS="$LIBS $TCLTK_LIBS"
41634163
41644164
AC_LINK_IFELSE([
41654165
AC_LANG_PROGRAM([
@@ -4201,7 +4201,7 @@ AC_ARG_VAR([GDBM_CFLAGS], [C compiler flags for gdbm])
42014201
AC_ARG_VAR([GDBM_LIBS], [additional linker flags for gdbm])
42024202
WITH_SAVE_ENV([
42034203
CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
4204-
LDFLAGS="$GDBM_LIBS $LDFLAGS"
4204+
LIBS="$LIBS $GDBM_LIBS"
42054205
AC_CHECK_HEADERS([gdbm.h], [
42064206
AC_CHECK_LIB([gdbm], [gdbm_open], [
42074207
have_gdbm=yes
@@ -5080,7 +5080,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
50805080
], [
50815081
WITH_SAVE_ENV([
50825082
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
5083-
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
5083+
LIBS="$LIBS $ZLIB_LIBS"
50845084
AC_CHECK_HEADERS([zlib.h], [
50855085
PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
50865086
], [have_zlib=no])
@@ -5104,7 +5104,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
51045104
PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
51055105
WITH_SAVE_ENV([
51065106
CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
5107-
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
5107+
LIBS="$LIBS $BZIP2_LIBS"
51085108
AC_CHECK_HEADERS([bzlib.h], [
51095109
AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
51105110
], [have_bzip2=no])
@@ -5118,7 +5118,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
51185118
PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
51195119
WITH_SAVE_ENV([
51205120
CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
5121-
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
5121+
LIBS="$LIBS $LIBLZMA_LIBS"
51225122
AC_CHECK_HEADERS([lzma.h], [
51235123
AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
51245124
], [have_liblzma=no])
@@ -6127,7 +6127,7 @@ AS_VAR_IF([with_readline], [readline], [
61276127
], [
61286128
WITH_SAVE_ENV([
61296129
CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
6130-
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
6130+
LIBS="$LIBS $LIBREADLINE_LIBS"
61316131
AC_CHECK_HEADERS([readline/readline.h], [
61326132
AC_CHECK_LIB([readline], [readline], [
61336133
LIBREADLINE=readline
@@ -6148,7 +6148,7 @@ AS_VAR_IF([with_readline], [edit], [
61486148
], [
61496149
WITH_SAVE_ENV([
61506150
CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
6151-
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
6151+
LIBS="$LIBS $LIBEDIT_LIBS"
61526152
AC_CHECK_HEADERS([editline/readline.h], [
61536153
AC_CHECK_LIB([edit], [readline], [
61546154
LIBREADLINE=edit
@@ -6172,7 +6172,7 @@ AS_VAR_IF([with_readline], [no], [
61726172
61736173
WITH_SAVE_ENV([
61746174
CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
6175-
LIBS="$READLINE_LIBS $LIBS"
6175+
LIBS="$LIBS $READLINE_LIBS"
61766176
LIBS_SAVE=$LIBS
61776177
61786178
m4_define([readline_includes], [

0 commit comments

Comments
 (0)