This seems horribly wrong somehow. Aren't we intested in the ${build}
-> ${host} compiler at this point anyway? So shouldn't we be testing
it? I think the whole block can go.
Hmm, it says indeed "this is going to change when we autoconfiscate".
Something like this?
Index: configure.ac
===================================================================
*** configure.ac (revision 121762)
--- configure.ac (working copy)
*************** if test -z "${CC}" && test "${build}" =
*** 1030,1055 ****
fi
if test "${build}" != "${host}" ; then
- # If we are doing a Canadian Cross, in which the host and build systems
- # are not the same, we set reasonable default values for the tools.
-
- CC=${CC-${host_noncanonical}-gcc}
- CFLAGS=${CFLAGS-"-g -O2"}
- CXX=${CXX-${host_noncanonical}-c++}
- CXXFLAGS=${CXXFLAGS-"-g -O2"}
CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-
else
! # Set reasonable default values for some tools even if not Canadian.
! # Of course, these are different reasonable default values, originally
! # specified directly in the Makefile.
! # We don't export, so that autoconf can do its job.
! # Note that all these settings are above the fragment inclusion point
! # in Makefile.in, so can still be overridden by fragments.
! # This is all going to change when we autoconfiscate...
!
CC_FOR_BUILD="\$(CC)"
! AC_PROG_CC
# We must set the default linker to the linker used by gcc for the
correct
# operation of libtool. If LD is not defined and we are using gcc,
try to
--- 1030,1042 ----
fi
if test "${build}" != "${host}" ; then
CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
else
! CFLAGS=${CFLAGS-"-g"}
CC_FOR_BUILD="\$(CC)"
! fi
!
! AC_PROG_CC
# We must set the default linker to the linker used by gcc for the
correct
# operation of libtool. If LD is not defined and we are using gcc,
try to
*************** else
*** 1070,1079 ****
fi
fi
! CXX=${CXX-"c++"}
! CFLAGS=${CFLAGS-"-g"}
! CXXFLAGS=${CXXFLAGS-"-g -O2"}
! fi
ACX_PROG_GNAT
ACX_PROG_CMP_IGNORE_INITIAL
--- 1057,1063 ----
fi
fi
! AC_PROG_CXX
ACX_PROG_GNAT
ACX_PROG_CMP_IGNORE_INITIAL
