From 371d1011d76361517ab1c11cee593e717ac714bd Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Mon, 20 Apr 2020 18:50:36 +0200 Subject: [PATCH] libphobos: Fix option name for --with-libphobos-druntime-only. libphobos/ChangeLog: * configure: Regenerate. * configure.ac: Fix option name for --with-libphobos-druntime-only. --- libphobos/ChangeLog | 5 +++++ libphobos/configure | 18 +++++++++--------- libphobos/configure.ac | 10 +++++----- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index e5b9225b9f9..959817eb760 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,8 @@ +2020-04-20 Iain Buclaw + + * configure: Regenerate. + * configure.ac: Fix option name for --with-libphobos-druntime-only. + 2020-04-20 Iain Buclaw * configure: Regenerate. diff --git a/libphobos/configure b/libphobos/configure index 0d4656ed929..06b5d0047c5 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -842,7 +842,7 @@ with_cross_host enable_version_specific_runtime_libs with_toolexeclibdir enable_libphobos -with_libdruntime_only +with_libphobos_druntime_only enable_libphobos_checking ' ac_precious_vars='build_alias @@ -15237,17 +15237,17 @@ $as_echo "$enable_libphobos" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libphobos-druntime-only" >&5 $as_echo_n "checking for --with-libphobos-druntime-only... " >&6; } -# Check whether --with-libdruntime-only was given. -if test "${with_libdruntime_only+set}" = set; then : - withval=$with_libdruntime_only; +# Check whether --with-libphobos-druntime-only was given. +if test "${with_libphobos_druntime_only+set}" = set; then : + withval=$with_libphobos_druntime_only; else - with_libdruntime_only=auto + with_libphobos_druntime_only=auto fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libdruntime_only" >&5 -$as_echo "$with_libdruntime_only" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libphobos_druntime_only" >&5 +$as_echo "$with_libphobos_druntime_only" >&6; } -case "$with_libdruntime_only" in +case "$with_libphobos_druntime_only" in yes|no|auto) ;; *) as_fn_error $? "Invalid argument for --with-libphobos-druntime-only" "$LINENO" 5 ;; esac @@ -15298,7 +15298,7 @@ fi # Decide if only libdruntime should be built. -case $LIBDRUNTIME_ONLY:$with_libdruntime_only in +case $LIBDRUNTIME_ONLY:$with_libphobos_druntime_only in *:no) only_libdruntime=no ;; *:yes) only_libdruntime=yes ;; yes:*) only_libdruntime=yes ;; diff --git a/libphobos/configure.ac b/libphobos/configure.ac index d82ad8e8c75..805e168881f 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac @@ -152,13 +152,13 @@ AC_ARG_ENABLE(libphobos, AC_MSG_RESULT($enable_libphobos) AC_MSG_CHECKING([for --with-libphobos-druntime-only]) -AC_ARG_WITH(libdruntime-only, +AC_ARG_WITH(libphobos-druntime-only, AS_HELP_STRING([--with-libphobos-druntime-only={yes,no,auto}], [build only the druntime library (default: auto)]),, - [with_libdruntime_only=auto]) -AC_MSG_RESULT($with_libdruntime_only) + [with_libphobos_druntime_only=auto]) +AC_MSG_RESULT($with_libphobos_druntime_only) -case "$with_libdruntime_only" in +case "$with_libphobos_druntime_only" in yes|no|auto) ;; *) AC_MSG_ERROR([Invalid argument for --with-libphobos-druntime-only]) ;; esac @@ -200,7 +200,7 @@ esac AM_CONDITIONAL(ENABLE_LIBPHOBOS, test x$use_libphobos = xyes) # Decide if only libdruntime should be built. -case $LIBDRUNTIME_ONLY:$with_libdruntime_only in +case $LIBDRUNTIME_ONLY:$with_libphobos_druntime_only in *:no) only_libdruntime=no ;; *:yes) only_libdruntime=yes ;; yes:*) only_libdruntime=yes ;;