From 8308411297a1ac68105a90967b8b851096e31a46 Mon Sep 17 00:00:00 2001 From: Mike Bland Date: Tue, 24 Jun 2014 00:39:33 -0400 Subject: [PATCH] Improve variable parsing when generating MINFO Before this change, variables for which a '=' appeared in the assignment would be parsed as the entire string up until the final '='. For example: BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ would result in the variable name "BUILD_CMD=shlib_target". This doesn't appear to harm the current generation of MINFO, but creates problems for other Makefile-related work I'm attempting. Change-Id: I1f3a606d67fd5464bb459e8f36c23b3e967b77e1 Signed-off-by: Mike Bland Signed-off-by: Geoff Thorpe Reviewed-by: Richard Levitte --- util/files.pl | 4 ++-- util/mkfiles.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/files.pl b/util/files.pl index b15407f0c9..d5c78bafc1 100755 --- a/util/files.pl +++ b/util/files.pl @@ -4,7 +4,7 @@ # It is basically a list of all variables from the passed makefile # -while ($ARGV[0] =~ /^(\S+)\s*=(.*)$/) +while ($ARGV[0] =~ /^([^\s=]+)\s*=\s*(.*)$/) { $sym{$1} = $2; shift; @@ -15,7 +15,7 @@ while (<>) { chop; s/#.*//; - if (/^(\S+)\s*=\s*(.*)$/) + if (/^([^\s=]+)\s*=\s*(.*)$/) { $o=""; ($s,$b)=($1,$2); diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 7dff4a695d..42db466688 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -110,7 +110,7 @@ while () { chop; s/#.*//; - if (/^(\S+)\s*=\s*(.*)$/) + if (/^([^\s=]+)\s*=\s*(.*)$/) { $o=""; ($s,$b)=($1,$2); -- 2.25.1