diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-22 16:57:00 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-22 16:57:00 (GMT) |
commit | d093125a6e1179f5de17e6a1e159b02c074aad3b (patch) | |
tree | a56b7bcda262c22c8081bb9f9da16cc2c710751e /unix | |
parent | dfb0ed4215bc02c12be4cfe83247cc6f8707526f (diff) | |
parent | c1065a28f93d92a848ffb2f35d79df4bc14532f2 (diff) | |
download | tcl-d093125a6e1179f5de17e6a1e159b02c074aad3b.zip tcl-d093125a6e1179f5de17e6a1e159b02c074aad3b.tar.gz tcl-d093125a6e1179f5de17e6a1e159b02c074aad3b.tar.bz2 |
Merge 8.6
Diffstat (limited to 'unix')
-rwxr-xr-x | unix/configure | 6 | ||||
-rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure index 52b63c4..ea26c4f 100755 --- a/unix/configure +++ b/unix/configure @@ -5902,12 +5902,6 @@ fi SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" - # Don't use -prebind when building for Mac OS X 10.4 or later only: - if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \ - "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then : - - LDFLAGS="$LDFLAGS -prebind" -fi LDFLAGS="$LDFLAGS -headerpad_max_install_names" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5 $as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; } diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3ad0e19..a206f26 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1459,10 +1459,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" - # Don't use -prebind when building for Mac OS X 10.4 or later only: - AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \ - "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4], [ - LDFLAGS="$LDFLAGS -prebind"]) LDFLAGS="$LDFLAGS -headerpad_max_install_names" AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [ |