Re: [PATCH 1/7] newlib: libm: merge machine/ trampoline up a level

Mike Frysinger <[email protected]> Wed, 26 Jan 2022 21:46:32 -0500

Newsgroups	gmane.comp.lib.newlib
Message-ID	<YfIHiBTH4hJJf9v/@vapier>

On 26 Jan 2022 15:58, Jon Turney wrote:
> On 23/01/2022 06:04, Mike Frysinger wrote:
> > The machine/{configure,Makefile} files exist only to fan out to the
> > specific machine/$arch/ subdir.  We already have all that same info
> > in the libm/ dir itself, so by moving the recursive configure and
> > make calls into it, we can cut off this logic entirely and save the
> > overhead.
> > 
> > For arches that don't have a machine subdir, it means they can skip
> > the logic entirely.
> 
> It looks like this (and the following commint) breaks 'man info' and 
> 'make man'?
> 
> 
> (e.g. https://github.com/cygwin/cygwin/runs/4949106511)

blah, sorry about that.  i have another series pending related to man page
unification that i've been testing with and doesn't have this issue.  but
that's still under review, so i pushed this quick hack fix since my series
deletes this entire chunk of code.
-mike

--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -199,7 +199,7 @@ stmp-targetdep: force
 	rm -f tmp-targetdep.texi
 	targetdoc=`pwd`/tmp-targetdep.texi; \
 	for d in $(SUBDIRS); do \
-	  if test "$$d" != "."; then \
+	  if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \
 	    (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \
 	  fi; \
 	done
@@ -218,7 +218,7 @@ libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \
 
 docbook-recursive: force
 	for d in $(SUBDIRS); do \
-	  if test "$$d" != "."; then \
+	  if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \
 	    (cd $$d && $(MAKE) docbook) || exit 1; \
 	  fi; \
 	done

signature.asc (application/pgp-signature, 833 B)