Skip to content
Snippets Groups Projects
Commit 032d311c authored by Raymond Toy's avatar Raymond Toy
Browse files

Add -M option to pass args to make.

parent b07a82ba
No related branches found
No related tags found
No related merge requests found
...@@ -96,6 +96,7 @@ usage () ...@@ -96,6 +96,7 @@ usage ()
echo " The flags always include -noinit -nositeinit" echo " The flags always include -noinit -nositeinit"
echo " -R Force recompiling the C runtime. Normally, just runs make to " echo " -R Force recompiling the C runtime. Normally, just runs make to "
echo " recompile anything that has changed." echo " recompile anything that has changed."
echo " -M opt Additional flags to be passed to make."
exit 1 exit 1
} }
...@@ -127,13 +128,17 @@ buildit () ...@@ -127,13 +128,17 @@ buildit ()
$TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; }
time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
if [ "$REBUILD_LISP" = "yes" ]; then if [ "$REBUILD_LISP" = "yes" ]; then
$TOOLDIR/rebuild-lisp.sh $TARGET if [ -z $MFLAGS ]; then
$TOOLDIR/rebuild-lisp.sh $TARGET
else
$TOOLDIR/rebuild-lisp.sh -M "$MFLAGS" $TARGET
fi
else else
# Set the LANG to C. For whatever reason, if I (rtoy) don't # Set the LANG to C. For whatever reason, if I (rtoy) don't
# do this on my openSuSE system, any messages from gcc are # do this on my openSuSE system, any messages from gcc are
# basically garbled. This should be harmless on other # basically garbled. This should be harmless on other
# systems. # systems.
LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } LANG=C $MAKE -C $TARGET/lisp $MFLAGS $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
fi fi
if [ "$BUILD_WORLD2" = "yes" ]; if [ "$BUILD_WORLD2" = "yes" ];
...@@ -152,7 +157,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh" ...@@ -152,7 +157,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh"
BUILD_POT="yes" BUILD_POT="yes"
UPDATE_TRANS= UPDATE_TRANS=
while getopts "123PRo:b:v:uB:C:Ui:f:w:O:?" arg while getopts "123PRo:b:v:uB:C:Ui:f:w:O:M:?" arg
do do
case $arg in case $arg in
1) ENABLE2="no" ;; 1) ENABLE2="no" ;;
...@@ -172,6 +177,7 @@ do ...@@ -172,6 +177,7 @@ do
U) UPDATE_TRANS="yes";; U) UPDATE_TRANS="yes";;
O) OLDLISPFLAGS="$OLDLISPFLAGS $OPTARG" ;; O) OLDLISPFLAGS="$OLDLISPFLAGS $OPTARG" ;;
R) REBUILD_LISP="yes";; R) REBUILD_LISP="yes";;
M) MFLAGS="$OPTARG" ;;
\?) usage \?) usage
;; ;;
esac esac
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment