From dd151ee816f6d89d08edda36da27880b88c32fae Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 29 Mar 2009 05:51:18 -0300 Subject: do_merge.pl: Do a small fix at the building part of the script From: Mauro Carvalho Chehab Priority: normal Signed-off-by: Mauro Carvalho Chehab --- v4l/scripts/do_merge.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l/scripts/do_merge.pl') diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl index 1ceb0ce75..0a4433a21 100755 --- a/v4l/scripts/do_merge.pl +++ b/v4l/scripts/do_merge.pl @@ -153,7 +153,7 @@ if ($n_heads == 2) { # Test resulting tree print "Testing if the build didn't break compilation. Only errors and warnings will be displayed. Please wait.\n"; -$ret = system ('make all|grep -v "^ CC"|grep -v "^ LD"'); +$ret = system ('make all|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); if ($ret) { print "Build failed. Can't procceed.\n"; -- cgit v1.2.3