PATCH: Make gcc_build log errors

Mark Mitchell mark@codesourcery.com
Tue Oct 31 17:59:00 GMT 2000


I'd screwed up the Bourne-shell pipe/redirection syntax in gcc_build;
this should fix it.

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com

2000-10-31  Mark Mitchell  <mark@codesourcery.com>

	* gcc_build (MAKE): New variable.
	(build_gcc): Use it.  Fix logging of errors.
	(install_gcc): Likewise.

Index: gcc_build
===================================================================
RCS file: /cvs/gcc/egcs/contrib/gcc_build,v
retrieving revision 1.5
diff -c -p -r1.5 gcc_build
*** gcc_build	2000/10/29 23:04:48	1.5
--- gcc_build	2000/11/01 01:57:08
***************
*** 37,42 ****
--- 37,48 ----
  # 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
  ########################################################################
*************** build_gcc() {
*** 142,149 ****
  	error "Could not configure GCC"
  
      # Bootstrap the compiler
!     (eval make ${MAKE_OPTIONS} bootstrap |
! 	tee -a ${LOGFILE}) 2>&1 || \
  	error "Could not build GCC"
  }
  
--- 148,155 ----
  	error "Could not configure GCC"
  
      # Bootstrap the compiler
!     (eval ${MAKE} ${MAKE_OPTIONS} bootstrap 2>&1 |
! 	tee -a ${LOGFILE}) || \
  	error "Could not build GCC"
  }
  
*************** test_gcc() {
*** 156,162 ****
      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})
  }
  
--- 162,168 ----
      changedir ${OBJDIR}
  
      echo "Running tests...  This will take a while."
!     (${MAKE} -k check 2>&1 | tee -a ${LOGFILE})
      (${DESTINATION}/contrib/test_summary | tee -a ${LOGFILE})
  }
  
*************** install_gcc() {
*** 184,190 ****
      # Go to the object directory.
      changedir ${OBJDIR}
  
!     make install > ${LOGFILE} 2>&1 || \
  	error "Installation failed"
  }
  
--- 190,196 ----
      # Go to the object directory.
      changedir ${OBJDIR}
  
!     (${MAKE} install 2>&1 | tee -a ${LOGFILE}) || \
  	error "Installation failed"
  }
  
*************** TARFILE="${HOME}/dev/gcc.tgz"
*** 214,219 ****
--- 220,227 ----
  
  # Options to pass to configure.
  CONFIGURE_OPTIONS=
+ # The `make' program.
+ MAKE=${MAKE:-make}
  # Options to pass to make.
  MAKE_OPTIONS=
  


More information about the Gcc-patches mailing list