JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdenv: Fix error message when checkPhase is missing

Browse Source
This commit is contained in:
Joachim Breitner 2020-11-07 11:52:59 +01:00 committed by Jonathan Ringer
parent b08a133aed
commit d92a19b039
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/setup.sh
View File

@ -1037,7 +1037,7 @@ checkPhase() {
runHook preCheck runHook preCheck
if [[ -z "${foundMakefile:-}" ]]; then if [[ -z "${foundMakefile:-}" ]]; then
echo "no Makefile or custom buildPhase, doing nothing" echo "no Makefile or custom checkPhase, doing nothing"
runHook postCheck runHook postCheck
return return
fi fi
@ -1182,7 +1182,7 @@ installCheckPhase() {
runHook preInstallCheck runHook preInstallCheck
if [[ -z "${foundMakefile:-}" ]]; then if [[ -z "${foundMakefile:-}" ]]; then
echo "no Makefile or custom buildPhase, doing nothing" echo "no Makefile or custom installCheckPhase, doing nothing"
#TODO(@oxij): should flagsArray influence make -n? #TODO(@oxij): should flagsArray influence make -n?
elif [[ -z "${installCheckTarget:-}" ]] \ elif [[ -z "${installCheckTarget:-}" ]] \
&& ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then