From 4e6827a013084ce3856af969c673e0237ffd5537 Mon Sep 17 00:00:00 2001 From: John Koleszar <jkoleszar@google.com> Date: Mon, 2 Aug 2010 10:21:52 -0400 Subject: [PATCH] configure: support directories containing .o Fixes http://code.google.com/p/webm/issues/detail?id=96 The regex which postprocesses the gcc make-deps (-M) output was too greedy and matching in the dependencies part of the rule rather than the target only. The patch provided with the issue was not correct, as it tried to match the .o at the end of the line, which isn't correct at least for my GCC version. This patch matches word characters instead of .* Thanks to raimue and the MacPorts community for isolating this issue. Change-Id: I28510da2252e03db910c017101d9db12e5945a27 --- build/make/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/make/configure.sh b/build/make/configure.sh index 35131b07b6..3b6c919fd7 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -378,7 +378,7 @@ EOF fmt_deps = sed -e 's;^__image.axf;\$(dir \$@)\$(notdir \$<).o \$@;' #hide EOF else cat >> $1 << EOF -fmt_deps = sed -e 's;^\(.*\)\.o;\$(dir \$@)\1\$(suffix \$<).o \$@;' #hide +fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\$(dir \$@)\1\$(suffix \$<).o \$@;' EOF fi -- GitLab