From 94beb5eb96c31aabee3e96eaf164b17980750e83 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 23 Feb 2016 19:06:21 +0000 Subject: [PATCH] build.py: Determine prerequisites from PREREQ@defs.mk instead of PREREQ_BUILD Signed-off-by: Jan Lindemann --- scripts/build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build.py b/scripts/build.py index 35a4405b..8ed0e136 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -32,7 +32,9 @@ def find_proj_path(name): def read_deps(cur, prereq_type): path = find_proj_path(cur) os.chdir(path) - p = subprocess.Popen("LD_LIBRARY_PATH= make echo-prereq | sed '/PREREQ_" + prereq_type + " *=/ !d; s/.*=//'", shell=True, stdout=subprocess.PIPE) + # ignoring prereq_type, as it has never been anything but BUILD, now + # only looking for PREREQ without anything + p = subprocess.Popen("LD_LIBRARY_PATH= make echo-prereq | sed '/PREREQ " + " *=/ !d; s/.*=//'", shell=True, stdout=subprocess.PIPE) p.wait() if p.returncode: # FIXME: doesn't work, because sed kills make's return code raise Exception("failed to get " + prereq_type + " prerequisites from " + path)