diff options
| author | mdejong <mdejong> | 2001-07-06 02:20:31 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2001-07-06 02:20:31 (GMT) |
| commit | b238f5b91918301d19821b57eb83c3bf077f2be6 (patch) | |
| tree | 0122d42607fc6421223f5d87207495faef102bcf /win/tcl.m4 | |
| parent | 6f3350d72668fbc24956091ab9fc547da83d5e03 (diff) | |
| download | tcl-b238f5b91918301d19821b57eb83c3bf077f2be6.zip tcl-b238f5b91918301d19821b57eb83c3bf077f2be6.tar.gz tcl-b238f5b91918301d19821b57eb83c3bf077f2be6.tar.bz2 | |
* win/Makefile.in: Subst DEPARG directly instead
of relying on a variable. This will make Cygwin
build faster since an extra exec will be avoided.
* win/configure: Regen.
* win/configure.in: Subst DEPARG.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Move AC_MSG_CHECKING
after the AC_CHECK_PROG so that status messages do
not get mixed together. Set DEPARG based on the
results of the cygpath check so that we avoid using
an extra exec when it is not needed. Use ac_cv_cygwin
status flag instead of looking at the output of
gcc -v, which works in the case where -mno-cygwin is
set in the CFLAGS.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -325,15 +325,21 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ AC_ARG_ENABLE(64bit,[ --enable-64bit enable 64bit support (where applicable)], [do64bit=$enableval], [do64bit=no]) AC_MSG_RESULT($do64bit) - AC_MSG_CHECKING([compiler flags]) # Set some defaults (may get changed below) EXTRA_CFLAGS="" AC_CHECK_PROG(CYGPATH, cygpath, cygpath -w, echo) + if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then + DEPARG='"$<"' + else + DEPARG='"$(shell $(CYGPATH) $<)"' + fi + # set various compiler flags depending on whether we are using gcc or cl - + + AC_MSG_CHECKING([compiler flags]) if test "${GCC}" = "yes" ; then if test "$do64bit" = "yes" ; then AC_MSG_WARN("64bit mode not supported with GCC on Windows") @@ -353,7 +359,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ MAKE_EXE="\${CC} -o \[$]@" LIBPREFIX="lib" - if "$CC" -v 2>&1 | egrep '\/gcc-lib\/i[[3-6]]86[[^\/]]*-cygwin' >/dev/null; then + if test "$ac_cv_cygwin" = "yes"; then extra_cflags="-mno-cygwin" extra_ldflags="-mno-cygwin" else |