--- glibc-2.4.90/stdlib/Makefile.testsuite-ldbl-bits	2006-03-20 04:39:04.000000000 -0500
+++ glibc-2.4.90/stdlib/Makefile	2006-07-21 05:39:34.000000000 -0400
@@ -124,9 +124,14 @@ ifeq (no,$(cross-compiling))
 tests: $(objpfx)tst-fmtmsg.out
 endif
 
+isomac-includes = -I../include $(+sysdep-includes) $(sysincludes) -I..
+ifeq (powerpc:8, $(base-machine):$(sizeof-long-double))
+# XXX only necessary for bootstrapping...
+isomac-includes += -I../libio -I../stdlib -I../wcsmbs
+endif
 $(objpfx)isomac.out: $(objpfx)isomac
 	$(dir $<)$(notdir $<) '$(CC)'  \
-	'-I../include $(+sysdep-includes) $(sysincludes) -I..' > $<.out
+	'$(isomac-includes)' > $<.out
 
 isomac-CFLAGS = -O
 $(objpfx)isomac: isomac.c