Skip to content

Commit c861cea

Browse files
author
jan.nijtmans
committed
-single_module is obsolete in macOS
1 parent 90757d1 commit c861cea

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327

328328
2007-09-15 Daniel Steffen <[email protected]>
329329

330-
* tcl.m4: replace all direct references to compiler by ${CC} to
330+
* tcl.m4: replace all direct references to compiler by ${CC} to
331331
enable CC overriding at configure & make time.
332332
(SunOS-5.1x): replace direct use of '/usr/ccs/bin/ld' in SHLIB_LD by
333333
'cc' compiler driver.

tcl.m4

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
12931293
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll'
12941294
12951295
TCL_LIB_VERSIONS_OK=nodots
1296-
;;
1296+
;;
12971297
AIX-*)
12981298
AS_IF([test "$GCC" != "yes"], [
12991299
# AIX requires the _r compiler when gcc isn't being used
@@ -1303,7 +1303,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
13031303
;;
13041304
*)
13051305
# Make sure only first arg gets _r
1306-
CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
1306+
CC=`echo "$CC" | sed -e 's/^\([[^ ]]*\)/\1_r/'`
13071307
;;
13081308
esac
13091309
AC_MSG_RESULT([Using $CC for compiling with threads])
@@ -1661,15 +1661,6 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
16611661
])
16621662
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
16631663
SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
1664-
AC_CACHE_CHECK([if ld accepts -single_module flag], tcl_cv_ld_single_module, [
1665-
hold_ldflags=$LDFLAGS
1666-
LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
1667-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int i;]])],
1668-
[tcl_cv_ld_single_module=yes],[tcl_cv_ld_single_module=no])
1669-
LDFLAGS=$hold_ldflags])
1670-
AS_IF([test $tcl_cv_ld_single_module = yes], [
1671-
SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
1672-
])
16731664
# TEA specific: link shlib with current and compatibility version flags
16741665
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
16751666
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
@@ -3417,7 +3408,7 @@ AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
34173408
# If Tcl was built as a framework, attempt to use
34183409
# the framework's Headers and PrivateHeaders directories
34193410
case ${TCL_DEFS} in
3420-
*TCL_FRAMEWORK*)
3411+
*TCL_FRAMEWORK*)
34213412
if test -d "${TCL_BIN_DIR}/Headers" -a \
34223413
-d "${TCL_BIN_DIR}/PrivateHeaders"; then
34233414
TCL_INCLUDES="-I\"${TCL_BIN_DIR}/Headers\" -I\"${TCL_BIN_DIR}/PrivateHeaders\" ${TCL_INCLUDES}"

0 commit comments

Comments
 (0)