diff options
author | Mark Mitchell <mark@codesourcery.com> | 2000-11-01 01:58:12 +0000 |
---|---|---|
committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-11-01 01:58:12 +0000 |
commit | 9f56c00431885c8a5dd23d872beb232546e00a9c (patch) | |
tree | d565a777f1aca81ff4689ff53affb009610b53b9 /contrib | |
parent | 32ee391b8317246560f346617f92a876bd376e30 (diff) | |
download | gcc-9f56c00431885c8a5dd23d872beb232546e00a9c.zip gcc-9f56c00431885c8a5dd23d872beb232546e00a9c.tar.gz gcc-9f56c00431885c8a5dd23d872beb232546e00a9c.tar.bz2 |
gcc_build (MAKE): New variable.
* gcc_build (MAKE): New variable.
(build_gcc): Use it. Fix logging of errors.
(install_gcc): Likewise.
From-SVN: r37180
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/ChangeLog | 6 | ||||
-rwxr-xr-x | contrib/gcc_build | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 2ebd692..d9a984b 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2000-10-31 Mark Mitchell <mark@codesourcery.com> + + * gcc_build (MAKE): New variable. + (build_gcc): Use it. Fix logging of errors. + (install_gcc): Likewise. + 2000-10-29 Mark Mitchell <mark@codesourcery.com> * gcc_build: Save the output from CVS into the logfile as well. diff --git a/contrib/gcc_build b/contrib/gcc_build index 0a3dd7b..ddcbb2f 100755 --- a/contrib/gcc_build +++ b/contrib/gcc_build @@ -37,6 +37,12 @@ # If you are using password-based CVS, you must manually log in, and # not log out from, the CVS server before running this script. +# You can set the following variables in the environment. They +# have no corresponding command-line options because they should +# only be needed infrequently: +# +# MAKE The path to `make'. + ######################################################################## # Functions ######################################################################## @@ -142,8 +148,8 @@ build_gcc() { error "Could not configure GCC" # Bootstrap the compiler - (eval make ${MAKE_OPTIONS} bootstrap | - tee -a ${LOGFILE}) 2>&1 || \ + (eval ${MAKE} ${MAKE_OPTIONS} bootstrap 2>&1 | + tee -a ${LOGFILE}) || \ error "Could not build GCC" } @@ -156,7 +162,7 @@ test_gcc() { changedir ${OBJDIR} echo "Running tests... This will take a while." - (make -k check | tee -a ${LOGFILE}) 2>&1 + (${MAKE} -k check 2>&1 | tee -a ${LOGFILE}) (${DESTINATION}/contrib/test_summary | tee -a ${LOGFILE}) } @@ -184,7 +190,7 @@ install_gcc() { # Go to the object directory. changedir ${OBJDIR} - make install > ${LOGFILE} 2>&1 || \ + (${MAKE} install 2>&1 | tee -a ${LOGFILE}) || \ error "Installation failed" } @@ -214,6 +220,8 @@ TARFILE="${HOME}/dev/gcc.tgz" # Options to pass to configure. CONFIGURE_OPTIONS= +# The `make' program. +MAKE=${MAKE:-make} # Options to pass to make. MAKE_OPTIONS= |