8000 [3.13] gh-128354: Consistently use LIBS over LDFLAGS in library build… · python/cpython@855af3b · GitHub
[go: up one dir, main page]
Skip to content

Commit 855af3b

Browse files
zaniebzanieb
authored
[3.13] gh-128354: Consistently use LIBS over LDFLAGS in library build… (#128465)
(cherry picked from commit b75ed95)
1 parent b923f48 commit 855af3b

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

‎configure

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

‎configure.ac

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3744,7 +3744,7 @@ AS_VAR_IF([have_uuid], [missing], [
37443744
], [
37453745
WITH_SAVE_ENV([
37463746
CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
3747-
LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
3747+
LIBS="$LIBS $LIBUUID_LIBS"
37483748
AC_CHECK_HEADERS([uuid/uuid.h], [
37493749
PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
37503750
PY_CHECK_LIB([uuid] 10000 , [uuid_generate_time_safe],
@@ -3978,7 +3978,7 @@ AS_VAR_IF([have_libffi], [missing], [
39783978
PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
39793979
WITH_SAVE_ENV([
39803980
CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
3981-
LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
3981+
LIBS="$LIBS $LIBFFI_LIBS"
39823982
AC_CHECK_HEADER([ffi.h], [
39833983
AC_CHECK_LIB([ffi], [ffi_call], [
39843984
have_libffi=yes
@@ -4012,8 +4012,8 @@ AS_VAR_IF([have_libffi], [yes], [
40124012
AS_VAR_IF([ac_cv_lib_dl_dlopen], [yes], [AS_VAR_APPEND([LIBFFI_LIBS], [" -ldl"])])
40134013
40144014
WITH_SAVE_ENV([
4015-
CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
4016-
LDFLAGS="$LIBFFI_LIBS $LDFLAGS"
4015+
CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
4016+
LIBS="$LIBS $LIBFFI_LIBS"
40174017
40184018
PY_CHECK_FUNC([ffi_prep_cif_var], [@%:@include <ffi.h>])
40194019
PY_CHECK_FUNC([ffi_prep_closure_loc], [@%:@include <ffi.h>])
@@ -4051,8 +4051,8 @@ AS_VAR_IF(
40514051

40524052
AS_VAR_IF([with_system_libmpdec], [yes],
40534053
[WITH_SAVE_ENV([
4054-
CPPFLAGS="$LIBMPDEC_CFLAGS $CPPFLAGS"
4055-
LIBS="$LIBMPDEC_LIBS $LIBS"
4054+
CPPFLAGS="$CPPFLAGS $LIBMPDEC_CFLAGS"
4055+
LIBS="$LIBS $LIBMPDEC_LIBS"
40564056
40574057
AC_LINK_IFELSE([
40584058
AC_LANG_PROGRAM([
@@ -4185,7 +4185,7 @@ WITH_SAVE_ENV([
41854185
dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
41864186
dnl hence CPPFLAGS instead of CFLAGS.
41874187
CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
4188-
LIBS="$LIBSQLITE3_LIBS $LIBS"
4188+
LIBS="$LIBS $LIBSQLITE3_LIBS"
41894189
41904190
AC_CHECK_HEADER([sqlite3.h], [
41914191
have_sqlite3=yes
@@ -4288,7 +4288,7 @@ AS_CASE([$ac_sys_system],
42884288

42894289
WITH_SAVE_ENV([
42904290
CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
4291-
LIBS="$TCLTK_LIBS $LDFLAGS"
4291+
LIBS="$LIBS $TCLTK_LIBS"
42924292
42934293
AC_LINK_IFELSE([
42944294
AC_LANG_PROGRAM([
@@ -4330,7 +4330,7 @@ AC_ARG_VAR([GDBM_CFLAGS], [C compiler flags for gdbm])
43304330
AC_ARG_VAR([GDBM_LIBS], [additional linker flags for gdbm])
43314331
WITH_SAVE_ENV([
43324332
CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
4333-
LDFLAGS="$GDBM_LIBS $LDFLAGS"
4333+
LIBS="$LIBS $GDBM_LIBS"
43344334
AC_CHECK_HEADERS([gdbm.h], [
43354335
AC_CHECK_LIB([gdbm], [gdbm_open], [
43364336
have_gdbm=yes
@@ -5288,7 +5288,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
52885288
], [
52895289
WITH_SAVE_ENV([
52905290
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
5291-
LDFLAGS="$LDFLAGS $ZLIB_LIBS"
5291+
LIBS="$LIBS $ZLIB_LIBS"
52925292
AC_CHECK_HEADERS([zlib.h], [
52935293
PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
52945294
], [have_zlib=no])
@@ -5312,7 +5312,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
53125312
PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
53135313
WITH_SAVE_ENV([
53145314
CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
5315-
LDFLAGS="$LDFLAGS $BZIP2_LIBS"
5315+
LIBS="$LIBS $BZIP2_LIBS"
53165316
AC_CHECK_HEADERS([bzlib.h], [
53175317
AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
53185318
], [have_bzip2=no])
@@ -5326,7 +5326,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
53265326
PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
53275327
WITH_SAVE_ENV([
53285328
CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
5329-
LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
5329+
LIBS="$LIBS $LIBLZMA_LIBS"
53305330
AC_CHECK_HEADERS([lzma.h], [
53315331
AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
53325332
], [have_liblzma=no])
@@ -6318,7 +6318,7 @@ AS_VAR_IF([with_readline], [readline], [
63186318
], [
63196319
WITH_SAVE_ENV([
63206320
CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
6321-
LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
6321+
LIBS="$LIBS $LIBREADLINE_LIBS"
63226322
AC_CHECK_HEADERS([readline/readline.h], [
63236323
AC_CHECK_LIB([readline], [readline], [
63246324
LIBREADLINE=readline
@@ -6339,7 +6339,7 @@ AS_VAR_IF([with_readline], [edit], [
63396339
], [
63406340
WITH_SAVE_ENV([
63416341
CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
6342-
LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
6342+
LIBS="$LIBS $LIBEDIT_LIBS"
63436343
AC_CHECK_HEADERS([editline/readline.h], [
63446344
AC_CHECK_LIB([edit], [readline], [
63456345
LIBREADLINE=edit
@@ -6363,7 +6363,7 @@ AS_VAR_IF([with_readline], [no], [
63636363
63646364
WITH_SAVE_ENV([
63656365
CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
6366-
LIBS="$READLINE_LIBS $LIBS"
6366+
LIBS="$LIBS $READLINE_LIBS"
63676367
LIBS_SAVE=$LIBS
63686368
63696369
m4_define([readline_includes], [

0 commit comments

Comments
 (0)
0