From 770dd85aaf0aa2b986a1fe827abfb3e48f2d4a1b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 27 Dec 2023 01:05:23 -0500 Subject: libgloss: merge visium into top-level Makefile Avoid a recursive make to speed things up a bit. A visium-elf build shows installed objects & libs produce same code. --- libgloss/configure | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'libgloss/configure') diff --git a/libgloss/configure b/libgloss/configure index 5aa46f002..970a4cb42 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -650,6 +650,8 @@ CONFIG_XSTORMY16_FALSE CONFIG_XSTORMY16_TRUE CONFIG_WINCE_FALSE CONFIG_WINCE_TRUE +CONFIG_VISIUM_FALSE +CONFIG_VISIUM_TRUE CONFIG_V850_FALSE CONFIG_V850_TRUE CONFIG_RX_FALSE @@ -2932,9 +2934,7 @@ case "${target}" in config_v850=true ;; visium-*-*) - ac_config_files="$ac_config_files visium/Makefile" - - subdirs="$subdirs visium" + config_visium=true config_testsuite=false ;; xc16x-*-*) @@ -3192,6 +3192,14 @@ else CONFIG_V850_FALSE= fi + if test x$config_visium = xtrue; then + CONFIG_VISIUM_TRUE= + CONFIG_VISIUM_FALSE='#' +else + CONFIG_VISIUM_TRUE='#' + CONFIG_VISIUM_FALSE= +fi + if test x$config_wince = xtrue; then CONFIG_WINCE_TRUE= CONFIG_WINCE_FALSE='#' @@ -5779,6 +5787,10 @@ if test -z "${CONFIG_V850_TRUE}" && test -z "${CONFIG_V850_FALSE}"; then as_fn_error $? "conditional \"CONFIG_V850\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_VISIUM_TRUE}" && test -z "${CONFIG_VISIUM_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_VISIUM\" 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 @@ -6455,7 +6467,6 @@ do "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/Makefile" ;; "microblaze/Makefile") CONFIG_FILES="$CONFIG_FILES microblaze/Makefile" ;; "mt/Makefile") CONFIG_FILES="$CONFIG_FILES mt/Makefile" ;; - "visium/Makefile") CONFIG_FILES="$CONFIG_FILES visium/Makefile" ;; "xc16x/Makefile") CONFIG_FILES="$CONFIG_FILES xc16x/Makefile" ;; "m32c/Makefile") CONFIG_FILES="$CONFIG_FILES m32c/Makefile" ;; "spu/Makefile") CONFIG_FILES="$CONFIG_FILES spu/Makefile" ;; -- cgit v1.2.3