From 79d6a211b2ca3e382bc3b53d682d4a3595189c86 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 6 Jan 2019 04:52:41 +0100 Subject: [PATCH] Set tls-model only if TLS is supported --- configure.ac | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ee2e6b50..9f0f4b67 100644 --- a/configure.ac +++ b/configure.ac @@ -211,9 +211,6 @@ AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [ AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [CFLAGS="$CFLAGS -fvisibility=hidden"]) -AX_CHECK_COMPILE_FLAG([-ftls-model=global-dynamic], - [CFLAGS="$CFLAGS -ftls-model=global-dynamic"]) - AS_CASE([$host_os], [cygwin*|mingw*|msys|pw32*|cegcc*], [ ], [ AX_CHECK_COMPILE_FLAG([-fPIC], [CFLAGS="$CFLAGS -fPIC"]) ]) @@ -340,7 +337,9 @@ AX_CHECK_CATCHABLE_SEGV AX_CHECK_CATCHABLE_ABRT AS_IF([test "x$with_threads" = "xyes"], [ - AX_TLS([AC_MSG_RESULT(thread local storage is supported)], + AX_TLS([AC_MSG_RESULT(thread local storage is supported) + AX_CHECK_COMPILE_FLAG([-ftls-model=global-dynamic], + [CFLAGS="$CFLAGS -ftls-model=global-dynamic"])], [AC_MSG_RESULT(thread local storage is not supported)]) ]) LT_INIT