Commit e20c1ac6 authored by Henry Weller's avatar Henry Weller
Browse files

wmakeCollect: Support simultaneous builds of different target architectures or compilers

parent 0bc82868
......@@ -347,13 +347,14 @@ scheduler="wmakeCollect"
if [ "$all" = "queue" ]
then
( \
wmakeLnIncludeAll -j$WM_NCOMPPROCS \
&& WM_ID=$(stat --format=%d.%i $PWD) \
WM_SCHEDULER=$scheduler \
trap '$scheduler -kill' TERM INT; \
wmake -all objects \
&& $scheduler \
( \
wmakeLnIncludeAll -j$WM_NCOMPPROCS \
&& WM_ID=${PWD////_}.$WM_OPTIONS \
WM_SCHEDULER=$scheduler \
trap '$scheduler -kill' TERM INT; \
$scheduler -clean \
&& wmake -all objects \
&& $scheduler \
) && wmake -all
exit $?
fi
......
......@@ -42,7 +42,8 @@ usage() {
Usage: $Script [OPTION] <command>
options:
-kill Removes temporary makefiles
-clean Clean-up before compilation (removes old makefiles)
-kill Clean-up after termination (removes makefiles)
-h | -help Print the usage
Collecting scheduler for fast parallel compilation of large numbers of object
......@@ -76,7 +77,7 @@ do
-h | -help)
usage
;;
-kill)
-kill | -clean)
cleanup="true"
shift
;;
......@@ -135,7 +136,7 @@ then
# Add the build rule for the current target
echo "$object: $makefile" >> $file
echo -e "\t cd $PWD && \\" >> $file
echo -e "\tcd $PWD && \\" >> $file
echo -e "\t${@:1:($#-1)} $object" >> $file
echo >> $file
else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment