diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-02-02 08:01:43 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-11 12:29:37 +0300 |
commit | f8aede785505de293feb0c105450a0f32e8cbfe6 (patch) | |
tree | a8b4f4a52bacadd1a0852bbba9579a7b813ace40 /libgloss/configure | |
parent | ad28934ad3bb2e9d6d231f55cedbd72a5480763e (diff) |
libgloss: merge libnosys into top-level Makefile
Avoid a recursive make to speed things up a bit.
Diffstat (limited to 'libgloss/configure')
-rwxr-xr-x | libgloss/configure | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libgloss/configure b/libgloss/configure index a3c8c4e73..5cc6dc1e0 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -614,6 +614,8 @@ am__quote am__include DEPDIR CC +CONFIG_LIBNOSYS_FALSE +CONFIG_LIBNOSYS_TRUE subdirs HAVE_DOC_FALSE HAVE_DOC_TRUE @@ -2899,12 +2901,15 @@ subdirs="$subdirs aarch64" esac -if test "${config_libnosys}" = "true"; then - ac_config_files="$ac_config_files libnosys/Makefile" - - subdirs="$subdirs libnosys" + if test x$config_libnosys = xtrue; then + CONFIG_LIBNOSYS_TRUE= + CONFIG_LIBNOSYS_FALSE='#' +else + CONFIG_LIBNOSYS_TRUE='#' + CONFIG_LIBNOSYS_FALSE= fi + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -5016,6 +5021,10 @@ if test -z "${HAVE_DOC_TRUE}" && test -z "${HAVE_DOC_FALSE}"; then as_fn_error $? "conditional \"HAVE_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5672,7 +5681,6 @@ do "or1k/Makefile") CONFIG_FILES="$CONFIG_FILES or1k/Makefile" ;; "pru/Makefile") CONFIG_FILES="$CONFIG_FILES pru/Makefile" ;; "nios2/Makefile") CONFIG_FILES="$CONFIG_FILES nios2/Makefile" ;; - "libnosys/Makefile") CONFIG_FILES="$CONFIG_FILES libnosys/Makefile" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; |