diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-12-31 04:53:04 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-28 03:14:57 +0300 |
| commit | dcbff9eea71d06454e7d55d6b7e72672c0987d6d (patch) | |
| tree | b70da12529996a30e499e346ba9ec7539b187f51 /newlib/configure | |
| parent | 996a85ba4c26789284339a4eaaa73dd532e613f2 (diff) | |
newlib: merge iconvdata into top-level Makefile
Avoid a recursive make with this tiny subdir to speed things up a bit.
Diffstat (limited to 'newlib/configure')
| -rwxr-xr-x | newlib/configure | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/newlib/configure b/newlib/configure index 7fb49d7ed..9bbb089a9 100755 --- a/newlib/configure +++ b/newlib/configure @@ -659,7 +659,8 @@ CRT0_DIR CRT0 HAVE_CRT0_FALSE HAVE_CRT0_TRUE -EXTRA_DIRS +HAVE_ICONVDATA_FALSE +HAVE_ICONVDATA_TRUE HAVE_MULTISUBDIR_FALSE HAVE_MULTISUBDIR_TRUE HAVE_DOC_FALSE @@ -12004,7 +12005,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12007 "configure" +#line 12008 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12110,7 +12111,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12113 "configure" +#line 12114 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12420,14 +12421,21 @@ else fi -EXTRA_DIRS= +HAVE_ICONVDATA=false case $host in i[34567]86-pc-linux-*) subdirs="$subdirs iconvdata" - EXTRA_DIRS=iconvdata + HAVE_ICONVDATA=true ;; esac + if $HAVE_ICONVDATA; then + HAVE_ICONVDATA_TRUE= + HAVE_ICONVDATA_FALSE='#' +else + HAVE_ICONVDATA_TRUE='#' + HAVE_ICONVDATA_FALSE= +fi CRT0= @@ -13608,6 +13616,10 @@ if test -z "${HAVE_MULTISUBDIR_TRUE}" && test -z "${HAVE_MULTISUBDIR_FALSE}"; th as_fn_error $? "conditional \"HAVE_MULTISUBDIR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_ICONVDATA_TRUE}" && test -z "${HAVE_ICONVDATA_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ICONVDATA\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_CRT0_TRUE}" && test -z "${HAVE_CRT0_FALSE}"; then as_fn_error $? "conditional \"HAVE_CRT0\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |