mirror of
https://github.com/curl/curl.git
synced 2025-04-24 16:40:32 +08:00
configure.ac: move -pthread CFLAGS setting back where it used to be
The fix for #8276 proposed in #8374 set `CFLAGS="$CFLAGS -pthead"` earlier than it used to be set, applying it in cases where it should not have been applied. This moves the AIX XLC check to a new `case $host in` block inside of the `if test "$USE_THREADS_POSIX" != "1"` block, where `CFLAGS="$CFLAGS -pthead"` used to happen. Fixes #8541 Closes #8542
This commit is contained in:
parent
c82b281e17
commit
2f5006da2f
24
configure.ac
24
configure.ac
@ -3522,23 +3522,27 @@ if test "$want_pthreads" != "no"; then
|
|||||||
dnl it doesn't actually work without -lpthread
|
dnl it doesn't actually work without -lpthread
|
||||||
USE_THREADS_POSIX=""
|
USE_THREADS_POSIX=""
|
||||||
;;
|
;;
|
||||||
*-ibm-aix*)
|
|
||||||
dnl Check if compiler is xlC
|
|
||||||
COMPILER_VERSION=`"$CC" -qversion 2>/dev/null`
|
|
||||||
if test x"$COMPILER_VERSION" = "x"; then
|
|
||||||
CFLAGS="$CFLAGS -pthread"
|
|
||||||
else
|
|
||||||
CFLAGS="$CFLAGS -qthreaded"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
CFLAGS="$CFLAGS -pthread"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
dnl if it wasn't found without lib, search for it in pthread lib
|
dnl if it wasn't found without lib, search for it in pthread lib
|
||||||
if test "$USE_THREADS_POSIX" != "1"
|
if test "$USE_THREADS_POSIX" != "1"
|
||||||
then
|
then
|
||||||
|
case $host in
|
||||||
|
*-ibm-aix*)
|
||||||
|
dnl Check if compiler is xlC
|
||||||
|
COMPILER_VERSION=`"$CC" -qversion 2>/dev/null`
|
||||||
|
if test x"$COMPILER_VERSION" = "x"; then
|
||||||
|
CFLAGS="$CFLAGS -pthread"
|
||||||
|
else
|
||||||
|
CFLAGS="$CFLAGS -qthreaded"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
CFLAGS="$CFLAGS -pthread"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
# assign PTHREAD for pkg-config use
|
# assign PTHREAD for pkg-config use
|
||||||
PTHREAD=" -pthread"
|
PTHREAD=" -pthread"
|
||||||
AC_CHECK_LIB(pthread, pthread_create,
|
AC_CHECK_LIB(pthread, pthread_create,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user