diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 17:46:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 17:46:54 (GMT) |
| commit | d4678ffb76df3bc67d3d59fa6015de3ab9d57d67 (patch) | |
| tree | 7e919b7ff51bdd269db1d87b699351e64aa8246f /win/tcl.m4 | |
| parent | ac5aeb1bf606dba5103b31fb017aeede2596111b (diff) | |
| download | tk-d4678ffb76df3bc67d3d59fa6015de3ab9d57d67.zip tk-d4678ffb76df3bc67d3d59fa6015de3ab9d57d67.tar.gz tk-d4678ffb76df3bc67d3d59fa6015de3ab9d57d67.tar.bz2 | |
sync win/tcl.m4 and win/rules.vc with Tcl
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -30,7 +30,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl], [directory containing tcl configuration (tclConfig.sh)]), - with_tclconfig="${withval}") + [with_tclconfig="${withval}"]) AC_MSG_CHECKING([for Tcl configuration]) AC_CACHE_VAL(ac_cv_c_tclconfig,[ @@ -148,7 +148,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ AC_ARG_WITH(tk, AS_HELP_STRING([--with-tk], [directory containing tk configuration (tkConfig.sh)]), - with_tkconfig="${withval}") + [with_tkconfig="${withval}"]) AC_MSG_CHECKING([for Tk configuration]) AC_CACHE_VAL(ac_cv_c_tkconfig,[ @@ -583,7 +583,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ RC="x86_64-w64-mingw32-windres" ;; arm64|aarch64) - CC="aarch64-w64-mingw32-${CC}" + CC="aarch64-w64-mingw32-clang" LD="aarch64-w64-mingw32-ld" AR="aarch64-w64-mingw32-ar" RANLIB="aarch64-w64-mingw32-ranlib" @@ -649,7 +649,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "$ac_cv_win32" != "yes"; then AC_MSG_ERROR([${CC} cannot produce win32 executables.]) fi - if test "$MACHINE" != "ARM64"; then + if test "$do64bit" != "arm64"; then extra_cflags="$extra_cflags -DHAVE_CPUID=1" fi @@ -811,9 +811,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ [tcl_win_64bit=no] ) if test "$tcl_win_64bit" = "yes" ; then - do64bit=amd64 - MACHINE="AMD64" - AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) + do64bit=amd64 + MACHINE="AMD64" + AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) fi ;; esac |