From 38bee3c8b6ca49031b30e3a8f974fe0690560de3 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 28 Nov 2008 11:56:27 +0000 Subject: This patch fixes the ugly race condition created through build_opt_tbl running twice at the same time, overwriting its output files. This caused a depending rule to produce an object file with no symbols in it. This should silence up the regularly happening build failure messages on the mailing list since we moved to the newer, much faster server. Signed-off-by: Stefan Reinauer Signed-off-by: Patrick Georgi Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3777 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/newconfig/config.g | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'util') diff --git a/util/newconfig/config.g b/util/newconfig/config.g index 26cee432dc..93e36bbde2 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -1607,6 +1607,7 @@ parser Config: token PATH: r'[-a-zA-Z0-9_.][-a-zA-Z0-9/_.]+[-a-zA-Z0-9_.]+' # Dir's on the other hand are abitrary # this may all be stupid. + token RULE: r'[-a-zA-Z0-9_$()./]+[-a-zA-Z0-9_ $()./]+[-a-zA-Z0-9_$()./]+' token DIRPATH: r'[-a-zA-Z0-9_$()./]+' token ID: r'[a-zA-Z_.]+[a-zA-Z0-9_.]*' token DELEXPR: r'{([^}]+|\\.)*}' @@ -1703,13 +1704,10 @@ parser Config: [ ELSE (stmt<>)* ] END - rule depsacts<>: - ( DEPENDS STR {{ if (C): adddep(ID, STR) }} - | ACTION STR {{ if (C): addaction(ID, STR) }} + rule makerule<>: MAKERULE RULE {{ if (C): addrule(RULE) }} + ( DEPENDS STR {{ if (C): adddep(RULE, STR) }} + | ACTION STR {{ if (C): addaction(RULE, STR) }} )* - - rule makerule<>: MAKERULE DIRPATH {{ if (C): addrule(DIRPATH) }} - depsacts<> END rule makedefine<>: -- cgit v1.2.3