summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-05-16 07:20:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-05-16 07:20:48 (GMT)
commit2b1a83cd8828afc227201acda128c7cdedf06f02 (patch)
treea62075673a0d27da7aca3c69165bbde774a4e94e /win
parentbc6a36f9493f9a335838085a41f225ed458e4075 (diff)
parent638dfc5d56a9002d03c280add7d96b505323b25c (diff)
downloadtcl-2b1a83cd8828afc227201acda128c7cdedf06f02.zip
tcl-2b1a83cd8828afc227201acda128c7cdedf06f02.tar.gz
tcl-2b1a83cd8828afc227201acda128c7cdedf06f02.tar.bz2
Merge 9.0
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in4
-rwxr-xr-xwin/configure2
-rw-r--r--win/tcl.m42
3 files changed, 4 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index b5aed05..23f7fe4 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -889,8 +889,8 @@ install-libraries: libraries install-tzdata install-msgs
$(ROOT_DIR)/library/cookiejar/*.gz; do \
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \
done;
- @echo "Installing package http 2.10a2 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/9.0/http-2.10a2.tm";
+ @echo "Installing package http 2.10a3 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/9.0/http-2.10a3.tm";
@echo "Installing package opt 0.4.7";
@for j in $(ROOT_DIR)/library/opt/*.tcl; do \
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
diff --git a/win/configure b/win/configure
index 66d807a..703125e 100755
--- a/win/configure
+++ b/win/configure
@@ -4085,7 +4085,7 @@ printf "%s\n" "$ac_cv_cross" >&6; }
RC="x86_64-w64-mingw32-windres"
;;
arm64|aarch64)
- CC="aarch64-w64-mingw32-clang"
+ CC="aarch64-w64-mingw32-${CC}"
LD="aarch64-w64-mingw32-ld"
AR="aarch64-w64-mingw32-ar"
RANLIB="aarch64-w64-mingw32-ranlib"
diff --git a/win/tcl.m4 b/win/tcl.m4
index dc98570..fa9d4a9 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -527,7 +527,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
RC="x86_64-w64-mingw32-windres"
;;
arm64|aarch64)
- CC="aarch64-w64-mingw32-clang"
+ CC="aarch64-w64-mingw32-${CC}"
LD="aarch64-w64-mingw32-ld"
AR="aarch64-w64-mingw32-ar"
RANLIB="aarch64-w64-mingw32-ranlib"