diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-08 22:52:05 +0200 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-08 22:52:05 +0200 |
commit | 72c136c9007e37b76426b847e8b239c0708b8da7 (patch) | |
tree | ae6a8fff04ae15047b9b0b221ba0256b97829b59 /libphobos/configure | |
parent | d0cc1b79b39994c917abb23f71064bb39eedcc70 (diff) | |
download | gcc-72c136c9007e37b76426b847e8b239c0708b8da7.zip gcc-72c136c9007e37b76426b847e8b239c0708b8da7.tar.gz gcc-72c136c9007e37b76426b847e8b239c0708b8da7.tar.bz2 |
libphobos: Remove --enable-unix configure option.
This option is not useful on its own as all posix modules require the
compiler to predefine version(Posix) anyway. So the option has been
removed, and logic moved into DRUNTIME_OS_SOURCES, where the conditional
DRUNTIME_OS_POSIX is set instead.
libphobos/ChangeLog:
* configure: Regenerate.
* configure.ac: Remove DRUNTIME_OS_UNIX.
* libdruntime/Makefile.am: Add DRUNTIME_DSOURCES_POSIX if
DRUNTIME_OS_POSIX is true.
* libdruntime/Makefile.in: Regenerate.
* m4/druntime/os.m4 (DRUNTIME_OS_UNIX): Remove, move AM_CONDITIONAL
logic to...
(DRUNTIME_OS_SOURCES): ...here. Rename conditional to
DRUNTIME_OS_POSIX.
Diffstat (limited to 'libphobos/configure')
-rwxr-xr-x | libphobos/configure | 59 |
1 files changed, 23 insertions, 36 deletions
diff --git a/libphobos/configure b/libphobos/configure index 65e32d8..108518d 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -662,6 +662,8 @@ DRUNTIME_OS_ARM_EABI_UNWINDER_FALSE DRUNTIME_OS_ARM_EABI_UNWINDER_TRUE DCFG_ARM_EABI_UNWINDER DCFG_THREAD_MODEL +DRUNTIME_OS_POSIX_FALSE +DRUNTIME_OS_POSIX_TRUE DRUNTIME_OS_SOLARIS_FALSE DRUNTIME_OS_SOLARIS_TRUE DRUNTIME_OS_MINGW_FALSE @@ -682,8 +684,6 @@ DRUNTIME_OS_ANDROID_FALSE DRUNTIME_OS_ANDROID_TRUE DRUNTIME_OS_AIX_FALSE DRUNTIME_OS_AIX_TRUE -DRUNTIME_OS_UNIX_FALSE -DRUNTIME_OS_UNIX_TRUE DRUNTIME_CPU_S390_FALSE DRUNTIME_CPU_S390_TRUE DRUNTIME_CPU_SYSTEMZ_FALSE @@ -835,7 +835,6 @@ enable_libtool_lock with_gcc_major_version_only enable_werror enable_druntime_gc -enable_unix enable_thread_lib with_libatomic with_libbacktrace @@ -1486,8 +1485,6 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-werror turns on -Werror [default=no] --enable-druntime-gc enable D runtime garbage collector (default: yes) - --enable-unix enables Unix runtime (default: yes, for Unix - targets) --enable-thread-lib=<arg> specify linker option for the system thread library (default: autodetect) @@ -11649,7 +11646,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11652 "configure" +#line 11649 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11755,7 +11752,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11758 "configure" +#line 11755 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14105,31 +14102,6 @@ fi - # Check whether --enable-unix was given. -if test "${enable_unix+set}" = set; then : - enableval=$enable_unix; : -else - enable_unix=auto -fi - - - case "$druntime_cv_target_os" in - aix*|*bsd*|cygwin*|darwin*|gnu*|linux*|skyos*|*solaris*|sysv*) d_have_unix=1 ;; - esac - if test -n "$d_have_unix" && test "$enable_unix" = auto ; then - enable_unix=yes - fi - if test "$enable_unix" = "yes"; then - DRUNTIME_OS_UNIX_TRUE= - DRUNTIME_OS_UNIX_FALSE='#' -else - DRUNTIME_OS_UNIX_TRUE='#' - DRUNTIME_OS_UNIX_FALSE= -fi - - - - druntime_target_os_parsed="" case "$druntime_cv_target_os" in @@ -14239,6 +14211,21 @@ else fi + druntime_target_posix="no" + case "$druntime_cv_target_os" in + aix*|*bsd*|cygwin*|darwin*|gnu*|linux*|skyos*|*solaris*|sysv*) + druntime_target_posix="yes" + ;; + esac + if test "$druntime_target_posix" = "yes"; then + DRUNTIME_OS_POSIX_TRUE= + DRUNTIME_OS_POSIX_FALSE='#' +else + DRUNTIME_OS_POSIX_TRUE='#' + DRUNTIME_OS_POSIX_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread model used by GDC" >&5 @@ -15599,10 +15586,6 @@ if test -z "${DRUNTIME_CPU_S390_TRUE}" && test -z "${DRUNTIME_CPU_S390_FALSE}"; as_fn_error $? "conditional \"DRUNTIME_CPU_S390\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${DRUNTIME_OS_UNIX_TRUE}" && test -z "${DRUNTIME_OS_UNIX_FALSE}"; then - as_fn_error $? "conditional \"DRUNTIME_OS_UNIX\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${DRUNTIME_OS_AIX_TRUE}" && test -z "${DRUNTIME_OS_AIX_FALSE}"; then as_fn_error $? "conditional \"DRUNTIME_OS_AIX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -15643,6 +15626,10 @@ if test -z "${DRUNTIME_OS_SOLARIS_TRUE}" && test -z "${DRUNTIME_OS_SOLARIS_FALSE as_fn_error $? "conditional \"DRUNTIME_OS_SOLARIS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${DRUNTIME_OS_POSIX_TRUE}" && test -z "${DRUNTIME_OS_POSIX_FALSE}"; then + as_fn_error $? "conditional \"DRUNTIME_OS_POSIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${DRUNTIME_OS_ARM_EABI_UNWINDER_TRUE}" && test -z "${DRUNTIME_OS_ARM_EABI_UNWINDER_FALSE}"; then as_fn_error $? "conditional \"DRUNTIME_OS_ARM_EABI_UNWINDER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |