X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make.sh;h=284d24007f52382ccceb224215f645a167ee2345;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=df101ca494e70fee51b2a15e061838be548d3adf;hpb=920649d1915aa94b4af894b7284c3a52b11cdf0f;p=sbcl.git diff --git a/make.sh b/make.sh index df101ca..284d240 100755 --- a/make.sh +++ b/make.sh @@ -62,24 +62,8 @@ SBCL_XC_HOST="${1:-sbcl --noprogrammer}" export SBCL_XC_HOST echo //SBCL_XC_HOST=\"$SBCL_XC_HOST\" -# the GNU dialect of "make" -- easier to find or port it than to -# try to figure out how to port to the local dialect... -if [ "$GNUMAKE" != "" ] ; then - # The user is evidently trying to tell us something. - GNUMAKE="$GNUMAKE" -elif [ -x "`which gmake`" ] ; then - # "gmake" is the preferred name in *BSD. - GNUMAKE=gmake -elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then - GNUMAKE=make -else - echo "GNU Make not found. Try setting the environment variable GNUMAKE." - exit 1 -fi - -export GNUMAKE -echo //GNUMAKE=\"$GNUMAKE\" - +. ./find-gnumake.sh +find_gnumake # If you're cross-compiling, you should probably just walk through the # make-config.sh script by hand doing the right thing on both the host @@ -124,7 +108,7 @@ sh make-target-contrib.sh || exit 1 echo echo The build seems to have finished successfully. If you would like echo run more extensive tests on the new SBCL, you can try -echo " cd tests && sh ./run-tests.sh." +echo " cd tests && sh ./run-tests.sh" echo "(but expect some failures on non-x86 platforms)." date