From: Cristiano Giuffrida <giuffrida@cs.vu.nl>
Date: Mon, 29 Sep 2014 07:36:13 +0000 (+0200)
Subject: llvm: Fix module map generation.
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=c3041d5c6d6b4c7a009248c09cb21ec152695106;p=minix.git

llvm: Fix module map generation.

Change-Id: If9c2bef4c0ef3d002ac65a2c66aabcf0cf99ff95
---

diff --git a/minix/llvm/minix.inc b/minix/llvm/minix.inc
index 242e28246..88c5f649e 100644
--- a/minix/llvm/minix.inc
+++ b/minix/llvm/minix.inc
@@ -20,6 +20,16 @@ function generate_modules_map()
 	echo "Generating Minix modules map..." 1>&2
 	cd ${MINIX_ROOT}
 	grep -r "^PROG=" . --include=Makefile | sed -e "s/\s*//g" | sed -e "s/PROG=//g" > ${TMPFILE}
+	grep -r "^PROGS=" . --include=Makefile | sed -e "s/\s\s*/ /g" | sed -e "s/PROGS=//g" | sed -e "s/\.\///g" | (
+		while read line; do
+			path=$(echo $line | cut -d' ' -f 1)
+			progs=$(echo $line | cut -d' ' -f 2-)
+			for p in $progs
+			do
+				echo $path$p
+			done
+		done
+	) >> ${TMPFILE}
 
 	cat ${TMPFILE} | sed -e "s/\.\///g" > ${TMPFILE}.1