72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From 59008cc7f85e1982eb298e1c424c2e6ad5942c4a Mon Sep 17 00:00:00 2001
|
|
From: David Seifert <soap@gentoo.org>
|
|
Date: Sat, 12 Jun 2021 22:29:03 +0200
|
|
Subject: [PATCH] Revert "AX_PTHREAD: target > host"
|
|
|
|
This reverts commit 2567e0ce0f3a11b535c6b527386197fb49ff172b.
|
|
|
|
* `AC_CANONICAL_HOST` is the system on which the actual binary will run,
|
|
`AC_CANONICAL_TARGET` is the system for which code is generated. The
|
|
Autoconf manual even mentions that
|
|
|
|
--target=target-type
|
|
the type of system for which any compiler tools in the package produce code (**rarely needed**).
|
|
---
|
|
m4/ax_pthread.m4 | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
|
|
index e5858e50..9f35d139 100644
|
|
--- a/m4/ax_pthread.m4
|
|
+++ b/m4/ax_pthread.m4
|
|
@@ -87,11 +87,11 @@
|
|
# modified version of the Autoconf Macro, you may extend this special
|
|
# exception to the GPL to apply to your modified version as well.
|
|
|
|
-#serial 30
|
|
+#serial 31
|
|
|
|
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
|
|
AC_DEFUN([AX_PTHREAD], [
|
|
-AC_REQUIRE([AC_CANONICAL_TARGET])
|
|
+AC_REQUIRE([AC_CANONICAL_HOST])
|
|
AC_REQUIRE([AC_PROG_CC])
|
|
AC_REQUIRE([AC_PROG_SED])
|
|
AC_LANG_PUSH([C])
|
|
@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
|
|
# --thread-safe: KAI C++
|
|
# pthread-config: use pthread-config program (for GNU Pth library)
|
|
|
|
-case $target_os in
|
|
+case $host_os in
|
|
|
|
freebsd*)
|
|
|
|
@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"],
|
|
# definitions is, on some systems, a strong hint that pthreads support is
|
|
# correctly enabled
|
|
|
|
-case $target_os in
|
|
+case $host_os in
|
|
darwin* | hpux* | linux* | osf* | solaris*)
|
|
ax_pthread_check_macro="_REENTRANT"
|
|
;;
|
|
@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
|
|
AC_CACHE_CHECK([whether more special flags are required for pthreads],
|
|
[ax_cv_PTHREAD_SPECIAL_FLAGS],
|
|
[ax_cv_PTHREAD_SPECIAL_FLAGS=no
|
|
- case $target_os in
|
|
+ case $host_os in
|
|
solaris*)
|
|
ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
|
|
;;
|
|
@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
|
|
|
|
# More AIX lossage: compile with *_r variant
|
|
if test "x$GCC" != "xyes"; then
|
|
- case $target_os in
|
|
+ case $host_os in
|
|
aix*)
|
|
AS_CASE(["x/$CC"],
|
|
[x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
|