* approved by rth

[pf3gnuchains/gcc-fork.git] / contrib / gcc_build

diff --git a/contrib/gcc_build b/contrib/gcc_build
index 8def575..4d0eea3 100755 (executable)
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -9,7 +9,7 @@
 # Contents:
 #   Script to automatically download and build GCC.
 #
-# Copyright (c) 2000 Free Software Foundation.
+# Copyright (c) 2000, 2001 Free Software Foundation.
 #
 # This file is part of GNU CC.
 #
@@ -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
 ########################################################################
@@ -55,12 +61,15 @@ usage() {
 cat <<EOF
 gcc_build        [-c configure_options] 
                 [-d destination_directory]
-                [-m make_options]
+                [-m make_boot_options]
+                [-o objdir]
                 [-u username]
                 [-p protocol]
                 [-t tarfile]
+                [bootstrap]
                 [build]
                 [checkout]
+                [configure]
                 [export]
                 [install]
                 [test]
@@ -118,13 +127,13 @@ update_gcc() {
     changedir ${DESTINATION}
 
     # Update the tree
-    ./contrib/gcc_update || \
+    ./contrib/gcc_update -d || \
        error "Could not update GCC"
 }
 
-# Build GCC.
+# Configure for a build of GCC.
 
-build_gcc() {
+configure_gcc() {
     # Go to the source directory.
     changedir ${DESTINATION}
 
@@ -137,14 +146,23 @@ build_gcc() {
     changedir ${OBJDIR}
 
     # Configure the tree.
-    (eval ${DESTINATION}/configure ${CONFIGURE_OPTIONS} | 
-        tee -a ${LOGFILE}) 2>&1 || \
+    echo "Configuring: ${DESTINATION}/configure ${CONFIGURE_OPTIONS}"
+    eval ${DESTINATION}/configure ${CONFIGURE_OPTIONS} || \
        error "Could not configure the compiler"
+}
+
+# Bootstrap GCC.  Assume configuration has already occurred.
+
+bootstrap_gcc() {
+    # Go to the source directory.
+    changedir ${DESTINATION}
+    # Go to the object directory.
+    changedir ${OBJDIR}
 
     # Bootstrap the compiler
-    (eval make ${MAKE_OPTIONS} bootstrap |
-       tee -a ${LOGFILE}) 2>&1 || \
-       error "Could not build the compiler"
+    echo "Building: ${MAKE} ${MAKE_BOOTSTRAP_OPTIONS} bootstrap"
+    eval ${MAKE} ${MAKE_BOOTSTRAP_OPTIONS} bootstrap || \
+       error "Could not bootstrap the compiler"
 }
 
 # Test GCC.
@@ -156,8 +174,8 @@ test_gcc() {
     changedir ${OBJDIR}
 
     echo "Running tests...  This will take a while."
-    (make -k check | tee -a ${LOGFILE}) 2>&1
-    (${DESTINATION}/contrib/test_summary | tee -a ${LOGFILE})
+    ${MAKE} -k check
+    ${DESTINATION}/contrib/test_summary
 }
 
 # Export the GCC source tree.
@@ -167,7 +185,7 @@ export_gcc() {
     changedir ${DESTINATION}
     # Go up one level.
     changedir ..
-    # Build a tarbal off the source directory.
+    # Build a tarball of the source directory.
     tar czf ${TARFILE} \
        --exclude=${OBJDIR} \
        --exclude=CVS \
@@ -184,8 +202,7 @@ install_gcc() {
     # Go to the object directory.
     changedir ${OBJDIR}
 
-    make install > ${LOGFILE} 2>&1 || \
-       error "Installation failed"
+    ${MAKE} install || error "Installation failed"
 }
 
 ########################################################################
@@ -207,19 +224,20 @@ DESTINATION="${HOME}/dev/gcc"
 # object directory.
 OBJDIR="objdir"
 
-# The file where information will be logged.
-LOGFILE=${HOME}/build-gcc.$$.log
 # The file where the tarred up sources will be placed.
 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=
+MAKE_BOOTSTRAP_OPTIONS=
 
 # Modes of operation
-BUILD=0
+BOOTSTRAP=0
 CHECKOUT=0
+CONFIGURE=0
 EXPORT=0
 INSTALL=0
 TEST=0
@@ -230,14 +248,15 @@ UPDATE=0
 ########################################################################
 
 # Parse the options.
-while getopts "c:d:m:t:" ARG; do
+while getopts "c:d:m:o:p:t:u:" ARG; do
     case $ARG in
     c)    CONFIGURE_OPTIONS="${OPTARG}";;
     d)    DESTINATION="${OPTARG}";;
-    m)    MAKE_OPTIONS="${OPTARG}";;
-    u)    CVS_USERNAME="${OPTARG}";;
+    m)    MAKE_BOOTSTRAP_OPTIONS="${OPTARG}";;
+    o)    OBJDIR="${OPTARG}";;
     p)    CVS_PROTOCOL="${OPTARG}";;
     t)    CVS_TARGFILE="${OPTARG}";;
+    u)    CVS_USERNAME="${OPTARG}";;
     \?)   usage;;
     esac
 done
@@ -246,8 +265,10 @@ shift `expr ${OPTIND} - 1`
 # Handle the major modes.
 while [ $# -ne 0 ]; do
     case $1 in
-    build)    BUILD=1;;
+    bootstrap) BOOTSTRAP=1;;
+    build)    CONFIGURE=1; BOOTSTRAP=1;;
     checkout) CHECKOUT=1;;
+    configure) CONFIGURE=1;;
     export)   EXPORT=1;;
     install)  INSTALL=1;;
     test)     TEST=1;;
@@ -262,11 +283,6 @@ if [ ${CHECKOUT} -ne 0 ] && [ ${UPDATE} -ne 0 ]; then
     error "Cannot checkout and update simultaneously"
 fi
 
-# Remove any old logfiles.
-rm -f ${LOGFILE}
-# Tell the user where to find the logfile.
-echo "gcc_build: The logfile for this run is ${LOGFILE}"
-
 # Checkout the tree.
 if [ ${CHECKOUT} -ne 0 ]; then
     checkout_gcc
@@ -274,9 +290,14 @@ elif [ ${UPDATE} -ne 0 ]; then
     update_gcc
 fi
 
-# Build the compiler.
-if [ ${BUILD} -ne 0 ]; then
-    build_gcc
+# Configure to build the tree.
+if [ ${CONFIGURE} -ne 0 ]; then
+    configure_gcc
+fi
+
+# Bootstrap the compiler.
+if [ ${BOOTSTRAP} -ne 0 ]; then
+    bootstrap_gcc
 fi
 
 # Test the compiler