diff options
author | Mike Frysinger <vapier@gentoo.org> | 2023-12-29 08:16:46 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2024-01-20 06:23:47 +0300 |
commit | 026422b03095ae4da5ed61bad65499fea7a638a3 (patch) | |
tree | aee80d592b53f6c8f46e4bc5b96b7d5863dd146a /libgloss/configure | |
parent | 3ecd983a7d7f7e674efbf2b43ede03ea4d1d42ec (diff) |
libgloss: merge ft32 into top-level Makefile
Avoid a recursive make to speed things up a bit.
A ft32-elf build shows installed objects & libs produce same code.
Mention of ft32-elf-common.ld is dropped as it has never existed
in the tree, and has been an (ignored) error in the past.
Diffstat (limited to 'libgloss/configure')
-rwxr-xr-x | libgloss/configure | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libgloss/configure b/libgloss/configure index cc76b4557..8d5a99df4 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -688,6 +688,8 @@ CONFIG_I960_FALSE CONFIG_I960_TRUE CONFIG_I386_FALSE CONFIG_I386_TRUE +CONFIG_FT32_FALSE +CONFIG_FT32_TRUE CONFIG_FRV_FALSE CONFIG_FRV_TRUE CONFIG_FR30_FALSE @@ -2903,9 +2905,7 @@ case "${target}" in config_frv=true ;; ft32*-*-*) - ac_config_files="$ac_config_files ft32/Makefile" - - subdirs="$subdirs ft32" + config_ft32=true ;; lm32*-*-*) config_lm32=true @@ -3071,6 +3071,14 @@ else CONFIG_FRV_FALSE= fi + if test x$config_ft32 = xtrue; then + CONFIG_FT32_TRUE= + CONFIG_FT32_FALSE='#' +else + CONFIG_FT32_TRUE='#' + CONFIG_FT32_FALSE= +fi + if test x$config_i386 = xtrue; then CONFIG_I386_TRUE= CONFIG_I386_FALSE='#' @@ -5750,6 +5758,10 @@ if test -z "${CONFIG_FRV_TRUE}" && test -z "${CONFIG_FRV_FALSE}"; then as_fn_error $? "conditional \"CONFIG_FRV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_FT32_TRUE}" && test -z "${CONFIG_FT32_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_FT32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_I386_TRUE}" && test -z "${CONFIG_I386_FALSE}"; then as_fn_error $? "conditional \"CONFIG_I386\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -6496,7 +6508,6 @@ do "cr16/Makefile") CONFIG_FILES="$CONFIG_FILES cr16/Makefile" ;; "cris/Makefile") CONFIG_FILES="$CONFIG_FILES cris/Makefile" ;; "crx/Makefile") CONFIG_FILES="$CONFIG_FILES crx/Makefile" ;; - "ft32/Makefile") CONFIG_FILES="$CONFIG_FILES ft32/Makefile" ;; "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/Makefile" ;; "microblaze/Makefile") CONFIG_FILES="$CONFIG_FILES microblaze/Makefile" ;; "mt/Makefile") CONFIG_FILES="$CONFIG_FILES mt/Makefile" ;; |