Index: mpid/globus2/mpich-globus2-cc.in
===================================================================
RCS file: /MPIhome/mpich/mpid/globus2/mpich-globus2-cc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
27a28,29
> RemoveDefaultOpt=0
> opt_args=
69a72,75
> 	-O* | -g)
> 	RemoveDefaultOpt=1
> 	opt_args="$opt_args $1"
> 	;;
139a146,160
> fi
> 
> #
> # Remove -O and -g from the default options if the user has supplied his/her
> # own set of optimization options.
> #
> if test $RemoveDefaultOpt -ne 0 ; then
>     gc_flags=`echo "$gc_flags" | \
> 	sed -e 's/[ 	][ 	]*-g[ 	][ 	]*/ /g' \
>             -e 's/^-g[ 	][ 	]*//' \
>             -e 's/[ 	][ 	]*-g$//' \
> 	    -e 's/[ 	][ 	]*-O[^ 	]*[ 	]*/ /g' \
>             -e 's/^-O[^ 	]*[ 	][ 	]*//' \
>             -e 's/[ 	][ 	]*-O[^ 	]*$//'`
>     compile_args="$opt_args $compile_args"
Index: mpid/globus2/mpich-globus2-fc.in
===================================================================
RCS file: /MPIhome/mpich/mpid/globus2/mpich-globus2-fc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -r1.5 -r1.6
29a30,31
> RemoveDefaultOpt=0
> opt_args=
74a77,80
> 	-O* | -g)
> 	RemoveDefaultOpt=1
> 	opt_args="$opt_args $1"
> 	;;
158a165,179
> fi
> 
> #
> # Remove -O and -g from the default options if the user has supplied his/her
> # own set of optimization options.
> #
> if test $RemoveDefaultOpt -ne 0 ; then
>     gc_flags=`echo "$gc_flags" | \
> 	sed -e 's/[ 	][ 	]*-g[ 	][ 	]*/ /g' \
>             -e 's/^-g[ 	][ 	]*//' \
>             -e 's/[ 	][ 	]*-g$//' \
> 	    -e 's/[ 	][ 	]*-O[^ 	]*[ 	]*/ /g' \
>             -e 's/^-O[^ 	]*[ 	][ 	]*//' \
>             -e 's/[ 	][ 	]*-O[^ 	]*$//'`
>     compile_args="$opt_args $compile_args"