summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-01-06 17:11:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-01-06 17:11:20 (GMT)
commit507af3b425099da840b4f48b868dbf3cd33ed7b6 (patch)
tree2e57ec0a8183deef82ab405d59d590cd8b85e531
parent9ab6f4a7c5bbe368a4a17acd1f4c90afc9a169ff (diff)
parent72eb4e42290dccb6db60a66a085c355fb1e779e9 (diff)
downloadtcl-507af3b425099da840b4f48b868dbf3cd33ed7b6.zip
tcl-507af3b425099da840b4f48b868dbf3cd33ed7b6.tar.gz
tcl-507af3b425099da840b4f48b868dbf3cd33ed7b6.tar.bz2
Merge 8.6
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index 26126b9..c57ee40 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6654,7 +6654,7 @@ printf "%s\n" "#define MODULE_SCOPE __private_extern__" >>confdefs.h
fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
- LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+ LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH"
printf "%s\n" "#define MAC_OSX_TCL 1" >>confdefs.h
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3730343..b85bcdf 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1459,7 +1459,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
])
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
- LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+ LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH"
AC_DEFINE(MAC_OSX_TCL, 1, [Is this a Mac I see before me?])
PLAT_OBJS='${MAC_OSX_OBJS}'
PLAT_SRCS='${MAC_OSX_SRCS}'