summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordas <das>2005-01-25 06:53:44 (GMT)
committerdas <das>2005-01-25 06:53:44 (GMT)
commitcbd6f3b18257a643fc4d8c0a480277e8015637f9 (patch)
tree0776e531e8f7abaac90b5c0235dbe9ea21a2e637 /unix
parentf11befd3bbce6f1f7a8cd43bb51bf6126ba125bf (diff)
downloadtcl-cbd6f3b18257a643fc4d8c0a480277e8015637f9.zip
tcl-cbd6f3b18257a643fc4d8c0a480277e8015637f9.tar.gz
tcl-cbd6f3b18257a643fc4d8c0a480277e8015637f9.tar.bz2
* unix/tcl.m4 (Darwin): fixed bug with static build linking to
dynamic library in /usr/lib etc instead of linking to static library earlier in search path. [Tcl Bug 956908] Removed obsolete references to Rhapsody. * unix/configure: autoconf-2.57
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure6
-rw-r--r--unix/tcl.m46
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure
index e354426..87d9544 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7269,7 +7269,7 @@ rm -f conftest*
;;
esac
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000"
@@ -7279,7 +7279,7 @@ rm -f conftest*
DL_OBJS="tclLoadDyld.o"
PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
- LDFLAGS="$LDFLAGS -prebind"
+ LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-Os"
@@ -7877,7 +7877,7 @@ fi;
;;
NetBSD-*|FreeBSD-*)
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
;;
RISCos-*)
;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 73488a6..94bf885 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1389,7 +1389,7 @@ dnl AC_CHECK_TOOL(AR, ar)
;;
esac
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD="cc -dynamiclib \${LDFLAGS}"
TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000"
@@ -1399,7 +1399,7 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_OBJS="tclLoadDyld.o"
PLAT_OBJS=\$\(MAC\_OSX_OBJS\)
DL_LIBS=""
- LDFLAGS="$LDFLAGS -prebind"
+ LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-Os"
@@ -1797,7 +1797,7 @@ dnl AC_CHECK_TOOL(AR, ar)
;;
NetBSD-*|FreeBSD-*)
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
;;
RISCos-*)
;;