diff options
author | Palmer Dabbelt <palmer@rivosinc.com> | 2022-08-23 16:12:56 -0700 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2022-08-26 16:47:48 +0200 |
commit | f59ff93046341e688bc36ea81bddd60eea405e21 (patch) | |
tree | 0d9ee65f3b901e136b0a4c90e6c50f1337fb2b30 /libgloss/configure | |
parent | 0819679a7a2101b7384b82f2449f56994359aa3a (diff) | |
download | newlib-f59ff93046341e688bc36ea81bddd60eea405e21.zip newlib-f59ff93046341e688bc36ea81bddd60eea405e21.tar.gz newlib-f59ff93046341e688bc36ea81bddd60eea405e21.tar.bz2 |
libgloss: riscv: Convert to non-recursive automake
PR 29515 points out our documentation builds are broken, let's just move
over to the new non-recursive builds.
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'libgloss/configure')
-rwxr-xr-x | libgloss/configure | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/libgloss/configure b/libgloss/configure index c504793..81ac9cc 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -631,6 +631,8 @@ CFLAGS CC CONFIG_WINCE_FALSE CONFIG_WINCE_TRUE +CONFIG_RISCV_FALSE +CONFIG_RISCV_TRUE CONFIG_LM32_FALSE CONFIG_LM32_TRUE CONFIG_LIBNOSYS_FALSE @@ -705,6 +707,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -783,6 +786,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1035,6 +1039,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1172,7 +1185,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1325,6 +1338,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2789,9 +2803,7 @@ subdirs="$subdirs aarch64" target_makefile_frag=${srcdir}/config/mips.mt ;; riscv*-*-*) - ac_config_files="$ac_config_files riscv/Makefile" - - subdirs="$subdirs riscv" + config_riscv=true ;; powerpc-*-*|powerpcle-*-*) ac_config_files="$ac_config_files rs6000/Makefile" @@ -2990,6 +3002,14 @@ else CONFIG_LM32_FALSE= fi + if test x$config_riscv = xtrue; then + CONFIG_RISCV_TRUE= + CONFIG_RISCV_FALSE='#' +else + CONFIG_RISCV_TRUE='#' + CONFIG_RISCV_FALSE= +fi + if test x$config_wince = xtrue; then CONFIG_WINCE_TRUE= CONFIG_WINCE_FALSE='#' @@ -5211,6 +5231,10 @@ if test -z "${CONFIG_LM32_TRUE}" && test -z "${CONFIG_LM32_FALSE}"; then as_fn_error $? "conditional \"CONFIG_LM32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_RISCV_TRUE}" && test -z "${CONFIG_RISCV_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_RISCV\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -5848,7 +5872,6 @@ do "sparc_leon/Makefile") CONFIG_FILES="$CONFIG_FILES sparc_leon/Makefile" ;; "sparc/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/Makefile" ;; "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;; - "riscv/Makefile") CONFIG_FILES="$CONFIG_FILES riscv/Makefile" ;; "rs6000/Makefile") CONFIG_FILES="$CONFIG_FILES rs6000/Makefile" ;; "mn10200/Makefile") CONFIG_FILES="$CONFIG_FILES mn10200/Makefile" ;; "mn10300/Makefile") CONFIG_FILES="$CONFIG_FILES mn10300/Makefile" ;; |