diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-01-23 04:19:41 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-26 11:11:20 +0300 |
| commit | 233997993408d2cba4f2fd973a61e49ee7f65922 (patch) | |
| tree | 00812757674699439974e271ade91d816f5c227b /newlib/libm/common | |
| parent | 6ac043b19204399b28f17ecadaef9301223668fc (diff) | |
newlib: libm: merge machine/ configure scripts up a level
The machine configure scripts are all effectively stub scripts that
pass the higher level options to its own makefile. The only one doing
any custom tests was nds32. The rest were all effectively the same as
the libm/ configure script.
So instead of recursively running configure in all of these subdirs,
generate their makefiles from the top-level configure. For nds32,
deploy a pattern of including subdir logic via m4:
m4_include([machine/nds32/acinclude.m4])
Even its set of checks are very small -- it does 2 preprocessor tests
and sets up 2 makefile conditionals.
Some of the generated machine makefiles have a bunch of extra stuff
added to them, but that's because they were inconsistent in their
configure libtool calls. The top-level has it, so it exports some
new vars to the ones that weren't already.
Diffstat (limited to 'newlib/libm/common')
| -rw-r--r-- | newlib/libm/common/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in index 5253d1815..937e5b984 100644 --- a/newlib/libm/common/Makefile.in +++ b/newlib/libm/common/Makefile.in @@ -103,7 +103,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../ltsugar.m4 \ $(top_srcdir)/../../ltversion.m4 \ $(top_srcdir)/../../lt~obsolete.m4 \ - $(top_srcdir)/../acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../acinclude.m4 \ + $(top_srcdir)/machine/nds32/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am @@ -429,7 +431,6 @@ sbindir = @sbindir@ shared_machine_dir = @shared_machine_dir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -subdirs = @subdirs@ sys_dir = @sys_dir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ |