|
6970 | 6970 | # |
6971 | 6971 | # Avoid #include <Python.h> or #include <pyport.h>. The <Python.h> header |
6972 | 6972 | # requires <pyconfig.h> header which is only written below by AC_OUTPUT below. |
6973 | | -# If the check is done after AC_OUTPUT, modifying LIBATOMIC has no effect |
| 6973 | +# If the check is done after AC_OUTPUT, modifying LIBS has no effect |
6974 | 6974 | # anymore. <pyport.h> cannot be included alone, it's designed to be included |
6975 | 6975 | # by <Python.h>: it expects other includes and macros to be defined. |
6976 | 6976 | _SAVE_VAR([CPPFLAGS]) |
@@ -7014,7 +7014,7 @@ int main() |
7014 | 7014 | ]) |
7015 | 7015 |
|
7016 | 7016 | AS_VAR_IF([ac_cv_libatomic_needed], [yes], |
7017 | | - [LIBATOMIC=${LIBATOMIC-"-latomic"}]) |
| 7017 | + [LIBS="${LIBS} -latomic"]) |
7018 | 7018 | _RESTORE_VAR([CPPFLAGS]) |
7019 | 7019 |
|
7020 | 7020 |
|
@@ -7286,10 +7286,7 @@ PY_STDLIB_MOD([_hashlib], [], [test "$ac_cv_working_openssl_hashlib" = yes], |
7286 | 7286 | [$OPENSSL_INCLUDES], [$OPENSSL_LDFLAGS $OPENSSL_LDFLAGS_RPATH $LIBCRYPTO_LIBS]) |
7287 | 7287 |
|
7288 | 7288 | dnl test modules |
7289 | | -PY_STDLIB_MOD([_testcapi], |
7290 | | - [test "$TEST_MODULES" = yes], [] |
7291 | | - dnl Modules/_testcapi/pyatomic.c uses <cpython/pyatomic.h> header |
7292 | | - [], [], [$LIBATOMIC]) |
| 7289 | +PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes]) |
7293 | 7290 | PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes]) |
7294 | 7291 | PY_STDLIB_MOD([_testclinic_limited], [test "$TEST_MODULES" = yes]) |
7295 | 7292 | PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes]) |
|
0 commit comments