1 files changed, 39 insertions, 35 deletions
diff --git a/libphobos/configure.ac b/libphobos/configure.ac
index c4a86f2..3b4d46a 100644
--- a/libphobos/configure.ac
+++ b/libphobos/configure.ac
@@ -113,6 +113,41 @@ AC_SUBST(phobos_compiler_shared_flag)
 lt_prog_compiler_pic_D="$phobos_compiler_shared_flag"
 pic_mode='default'
 
+# Determine what GCC version number to use in filesystem paths.
+GCC_BASE_VER
+
+# libphobos/libdruntime specific options and feature detection
+DRUNTIME_CONFIGURE
+DRUNTIME_MULTILIB
+DRUNTIME_WERROR
+DRUNTIME_GC
+DRUNTIME_CPU_SOURCES
+DRUNTIME_OS_UNIX
+DRUNTIME_OS_SOURCES
+DRUNTIME_OS_THREAD_MODEL
+DRUNTIME_OS_ARM_EABI_UNWINDER
+DRUNTIME_OS_MINFO_BRACKETING
+DRUNTIME_OS_DLPI_TLS_MODID
+DRUNTIME_OS_LINK_SPEC
+DRUNTIME_LIBRARIES_CLIB
+
+WITH_LOCAL_DRUNTIME([
+  AC_LANG_PUSH([D])
+  AC_SEARCH_LIBS([malloc], [c])
+  DRUNTIME_LIBRARIES_THREAD
+  AC_SEARCH_LIBS([cosf], [m])
+  AC_SEARCH_LIBS([clock_gettime], [rt])
+  DRUNTIME_ENABLE_ATOMIC_BUILTINS
+  AC_LANG_POP([D])
+], [-nophoboslib])
+
+DRUNTIME_LIBRARIES_ATOMIC
+DRUNTIME_LIBRARIES_BACKTRACE
+DRUNTIME_LIBRARIES_DLOPEN
+DRUNTIME_LIBRARIES_NET
+DRUNTIME_LIBRARIES_ZLIB
+DRUNTIME_INSTALL_DIRECTORIES
+
 AC_MSG_CHECKING([for --enable-libphobos])
 AC_ARG_ENABLE(libphobos,
   [AS_HELP_STRING([--enable-libphobos], [Enable libphobos])])
@@ -136,6 +171,10 @@ case ${host} in
     if test x$druntime_cv_use_gas = xno; then
       LIBPHOBOS_SUPPORTED=no
     fi
+    # 64-bit D execution fails with Solaris ld without -z relax=transtls support.
+    if test "$druntime_ld_gld" = "no" && test "$druntime_ld_relax_transtls" = "no"; then
+      LIBPHOBOS_SUPPORTED=no
+    fi
     ;;
 esac
 AC_MSG_RESULT($LIBPHOBOS_SUPPORTED)
@@ -149,41 +188,6 @@ yes:*) use_libphobos=yes ;;
 esac
 AM_CONDITIONAL(ENABLE_LIBPHOBOS, test x$use_libphobos = xyes)
 
-# Determine what GCC version number to use in filesystem paths.
-GCC_BASE_VER
-
-# libphobos/libdruntime specific options and feature detection
-DRUNTIME_CONFIGURE
-DRUNTIME_MULTILIB
-DRUNTIME_WERROR
-DRUNTIME_GC
-DRUNTIME_CPU_SOURCES
-DRUNTIME_OS_UNIX
-DRUNTIME_OS_SOURCES
-DRUNTIME_OS_THREAD_MODEL
-DRUNTIME_OS_ARM_EABI_UNWINDER
-DRUNTIME_OS_MINFO_BRACKETING
-DRUNTIME_OS_DLPI_TLS_MODID
-DRUNTIME_OS_LINK_SPEC
-DRUNTIME_LIBRARIES_CLIB
-
-WITH_LOCAL_DRUNTIME([
-  AC_LANG_PUSH([D])
-  AC_SEARCH_LIBS([malloc], [c])
-  DRUNTIME_LIBRARIES_THREAD
-  AC_SEARCH_LIBS([cosf], [m])
-  AC_SEARCH_LIBS([clock_gettime], [rt])
-  DRUNTIME_ENABLE_ATOMIC_BUILTINS
-  AC_LANG_POP([D])
-], [-nophoboslib])
-
-DRUNTIME_LIBRARIES_ATOMIC
-DRUNTIME_LIBRARIES_BACKTRACE
-DRUNTIME_LIBRARIES_DLOPEN
-DRUNTIME_LIBRARIES_NET
-DRUNTIME_LIBRARIES_ZLIB
-DRUNTIME_INSTALL_DIRECTORIES
-
 # Add drtbegin.o/drtend.o to startfile/endfile specs in libgphobos.spec
 if test "$DCFG_MINFO_BRACKETING" = "false"; then
     DRTSTUFF_SPEC=$srcdir/src/drtstuff.spec