On 8/22/2012 8:52 PM, Bruce Korb wrote:
On 08/22/12 17:05, rbmj wrote:
Hello Everyone,
I have ten patches which are approved or obvious but waiting on commit
The include fixing stuff looks fine to me.
However I think it might be simpler to tweak mkfixinc.sh to
sed '/if test -s .{MACRO_LIST}/s/$/ && false/' \
${srcdir}/fixinc.in > ${target}
for vxworks rather than all that configury rigmarole.
That would eliminate changes to gcc/configure.ac and gcc/Makefile.in.
I didn't even think of that. I was probably doing all my fixes in the
Makefile because that was where I was looking with the original
problem. However, I'm looking at the result of that sed command, and I
don't think that the && is going to work, as when I run that sed command
I just get whitespace there. IIRC, sed handles '&' differently so it
probably needs to be escaped. I'll see if I get a chance to test that
later on.
Basically degrading the entire first patch to this:
$ svn diff mkfixinc.sh
Index: mkfixinc.sh
===================================================================
1 == '-u'
2 == '-L'
3 == 'mkfixinc.sh (revision 190448)'
4 == '-L'
5 == 'mkfixinc.sh (working copy)'
6 == '.svn/text-base/mkfixinc.sh.svn-base'
7 == 'mkfixinc.sh'
--- mkfixinc.sh (revision 190448)
+++ mkfixinc.sh (working copy)
@@ -15,7 +15,6 @@
i?86-*-mingw32* | \
x86_64-*-mingw32* | \
i?86-*-interix* | \
- *-*-vxworks* | \
powerpc-*-eabisim* | \
powerpc-*-eabi* | \
powerpc-*-rtems* | \
@@ -26,6 +25,11 @@
(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
;;
+ *-*-vxworks* )
+ sed '/if test -s .{MACRO_LIST}/s/$/ && false/' \
+ ${srcdir}/fixinc.in > ${target}
+ ;;
+
*)
cat < ${srcdir}/fixinc.in > ${target} || exit 1
;;
Assuming that when I test everything works and I can get a successful
build that works for me. Probably won't get a chance to test as I don't
have very much time until the weekend and right now there's another
regression in rs6000 (issue with one of the macros) that's breaking that
I have to fix before I get to that part of the build process.
Thanks for your input. That's certainly a simpler fix.
--
Robert Mason
