This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[libgfortran] Fix libgfortran multilibs


[Reposting because the original subject might not get noticed.]

	With Phil Edwards and Daniel Jacobowitz help, I tracked down the
problem to config-ml.in.

Okay for mainline?

	* config-ml.in: Change F77 to GFORTRAN.

Index: config-ml.in
===================================================================
RCS file: /cvs/gcc/gcc/config-ml.in,v
retrieving revision 1.31
diff -c -p -r1.31 config-ml.in
*** config-ml.in	30 May 2004 21:54:22 -0000	1.31
--- config-ml.in	5 Nov 2004 19:49:49 -0000
*************** if [ -n "${multidirs}" ] && [ -z "${ml_n
*** 779,790 ****
          break
        fi
      done
!     ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags"'
  
      if [ "${with_target_subdir}" = "." ]; then
  	CC_=$CC' '
  	CXX_=$CXX' '
! 	F77_=$F77' '
  	GCJ_=$GCJ' '
      else
  	# Create a regular expression that matches any string as long
--- 779,790 ----
          break
        fi
      done
!     ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GFORTRAN="${GFORTRAN_}$flags" GCJ="${GCJ_}$flags"'
  
      if [ "${with_target_subdir}" = "." ]; then
  	CC_=$CC' '
  	CXX_=$CXX' '
! 	GFORTRAN_=$GFORTRAN' '
  	GCJ_=$GCJ' '
      else
  	# Create a regular expression that matches any string as long
*************** if [ -n "${multidirs}" ] && [ -z "${ml_n
*** 814,828 ****
  	  esac
  	done
  
! 	F77_=
! 	for arg in ${F77}; do
  	  case $arg in
  	  -[BIL]"${ML_POPDIR}"/*)
! 	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
  	  "${ML_POPDIR}"/*)
! 	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
  	  *)
! 	    F77_="${F77_}${arg} " ;;
  	  esac
  	done
  
--- 814,828 ----
  	  esac
  	done
  
! 	GFORTRAN_=
! 	for arg in ${GFORTRAN}; do
  	  case $arg in
  	  -[BIL]"${ML_POPDIR}"/*)
! 	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
  	  "${ML_POPDIR}"/*)
! 	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
  	  *)
! 	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
  	  esac
  	done
  


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]