Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0d4aa03

Browse files
committed
Fix agressive collection of thread flags.
1 parent 26f6111 commit 0d4aa03

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

config/acx_pthread.m4

+3-2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ esac
8282
if test x"$acx_pthread_ok" = xno; then
8383
for flag in $acx_pthread_flags; do
8484
85+
tryPTHREAD_CFLAGS=""
86+
tryPTHREAD_LIBS=""
8587
case $flag in
8688
none)
8789
AC_MSG_CHECKING([whether pthreads work without any flags])
@@ -125,7 +127,7 @@ for flag in $acx_pthread_flags; do
125127
[pthread_t th; pthread_join(th, 0);
126128
pthread_attr_init(0); pthread_cleanup_push(0, 0);
127129
pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
128-
[acx_pthread_ok=yes])
130+
[acx_pthread_ok=yes], [acx_pthread_ok=no])
129131
130132
LIBS="$save_LIBS"
131133
CFLAGS="$save_CFLAGS"
@@ -138,7 +140,6 @@ for flag in $acx_pthread_flags; do
138140
PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
139141
PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
140142
fi
141-
142143
done
143144
fi
144145

configure

+3-1
Original file line numberDiff line numberDiff line change
@@ -13204,6 +13204,8 @@ esac
1320413204
if test x"$acx_pthread_ok" = xno; then
1320513205
for flag in $acx_pthread_flags; do
1320613206

13207+
tryPTHREAD_CFLAGS=""
13208+
tryPTHREAD_LIBS=""
1320713209
case $flag in
1320813210
none)
1320913211
echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
@@ -13317,6 +13319,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
1331713319
else
1331813320
echo "$as_me: failed program was:" >&5
1331913321
cat conftest.$ac_ext >&5
13322+
acx_pthread_ok=no
1332013323
fi
1332113324
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
1332213325

@@ -13332,7 +13335,6 @@ echo "${ECHO_T}$acx_pthread_ok" >&6
1333213335
PTHREAD_LIBS=" $tryPTHREAD_LIBS $PTHREAD_LIBS"
1333313336
PTHREAD_CFLAGS="$PTHREAD_CFLAGS $tryPTHREAD_CFLAGS"
1333413337
fi
13335-
1333613338
done
1333713339
fi
1333813340

0 commit comments

Comments
 (0)