* commit '18aad5fea1c1cf651a518d73bfb43e13fcad0a40': Return non-zero if can't locate top of the tree in m/mm/mmm.
This commit is contained in:
@@ -672,6 +672,7 @@ function m()
|
|||||||
$DRV make -C $T -f build/core/main.mk $@
|
$DRV make -C $T -f build/core/main.mk $@
|
||||||
else
|
else
|
||||||
echo "Couldn't locate the top of the tree. Try setting TOP."
|
echo "Couldn't locate the top of the tree. Try setting TOP."
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -710,8 +711,10 @@ function mm()
|
|||||||
local M=`echo $M|sed 's:'$T'/::'`
|
local M=`echo $M|sed 's:'$T'/::'`
|
||||||
if [ ! "$T" ]; then
|
if [ ! "$T" ]; then
|
||||||
echo "Couldn't locate the top of the tree. Try setting TOP."
|
echo "Couldn't locate the top of the tree. Try setting TOP."
|
||||||
|
return 1
|
||||||
elif [ ! "$M" ]; then
|
elif [ ! "$M" ]; then
|
||||||
echo "Couldn't locate a makefile from the current directory."
|
echo "Couldn't locate a makefile from the current directory."
|
||||||
|
return 1
|
||||||
else
|
else
|
||||||
for ARG in $@; do
|
for ARG in $@; do
|
||||||
case $ARG in
|
case $ARG in
|
||||||
@@ -774,6 +777,7 @@ function mmm()
|
|||||||
ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $ARGS
|
ONE_SHOT_MAKEFILE="$MAKEFILE" $DRV make -C $T -f build/core/main.mk $DASH_ARGS $MODULES $ARGS
|
||||||
else
|
else
|
||||||
echo "Couldn't locate the top of the tree. Try setting TOP."
|
echo "Couldn't locate the top of the tree. Try setting TOP."
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -786,6 +790,7 @@ function mma()
|
|||||||
else
|
else
|
||||||
if [ ! "$T" ]; then
|
if [ ! "$T" ]; then
|
||||||
echo "Couldn't locate the top of the tree. Try setting TOP."
|
echo "Couldn't locate the top of the tree. Try setting TOP."
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'`
|
local MY_PWD=`PWD= /bin/pwd|sed 's:'$T'/::'`
|
||||||
$DRV make -C $T -f build/core/main.mk $@ all_modules BUILD_MODULES_IN_PATHS="$MY_PWD"
|
$DRV make -C $T -f build/core/main.mk $@ all_modules BUILD_MODULES_IN_PATHS="$MY_PWD"
|
||||||
@@ -825,6 +830,7 @@ function mmma()
|
|||||||
$DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS all_modules BUILD_MODULES_IN_PATHS="$MODULE_PATHS"
|
$DRV make -C $T -f build/core/main.mk $DASH_ARGS $ARGS all_modules BUILD_MODULES_IN_PATHS="$MODULE_PATHS"
|
||||||
else
|
else
|
||||||
echo "Couldn't locate the top of the tree. Try setting TOP."
|
echo "Couldn't locate the top of the tree. Try setting TOP."
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user