summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2006-10-16 18:41:25 (GMT)
committerdas <das>2006-10-16 18:41:25 (GMT)
commit500354bed1dd1c346a7638475fdd9a3c4be70184 (patch)
treee9f59b4bacf228f286426398eabb8b58a1505d0f /macosx
parent83ed8e2d6b100cc7247aea88a50772356195200e (diff)
downloadtcl-500354bed1dd1c346a7638475fdd9a3c4be70184.zip
tcl-500354bed1dd1c346a7638475fdd9a3c4be70184.tar.gz
tcl-500354bed1dd1c346a7638475fdd9a3c4be70184.tar.bz2
* unix/tclUnixThrd.c (TclpThreadGetStackSize): Darwin: fix for main
thread, where pthread_get_stacksize_np() returns incorrect info. * macosx/GNUmakefile: don't redo prebinding of non-prebound binaires.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/GNUmakefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 950ed50..7bcedf2 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -4,7 +4,7 @@
# uses the standard unix build system in tcl/unix (which can be used directly instead of this
# if you are not using the tk/macosx projects).
#
-# RCS: @(#) $Id: GNUmakefile,v 1.3 2006/04/12 00:58:01 das Exp $
+# RCS: @(#) $Id: GNUmakefile,v 1.4 2006/10/16 18:41:25 das Exp $
#
########################################################################################################
@@ -154,14 +154,17 @@ ifeq (${EMBEDDED_BUILD},1)
@rm -f "${INSTALL_ROOT}${BINDIR}/${TCLSH}" && \
rmdir -p "${INSTALL_ROOT}${BINDIR}" 2>&- || true
else
-# redo prebinding
- @cd ${INSTALL_ROOT}/ && \
+# redo prebinding (when not building for Mac OS X 10.4 or later only)
+ @if [ "`echo "$${MACOSX_DEPLOYMENT_TARGET}" | \
+ awk -F '10\\.' '{print int($$2)}'`" -lt 4 -a "`echo "$${CFLAGS}" | \
+ awk -F '-mmacosx-version-min=10\\.' '{print int($$2)}'`" -lt 4 ]; \
+ then cd ${INSTALL_ROOT}/; \
if [ ! -d usr/lib ]; then mkdir -p usr && ln -fs /usr/lib usr/ && RM_USRLIB=1; fi; \
if [ ! -d System ]; then ln -fs /System . && RM_SYSTEM=1; fi; \
redo_prebinding -r . "./${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}/${PRODUCT_NAME}"; \
redo_prebinding -r . "./${BINDIR}/${TCLSH}"; \
if [ -n "$${RM_USRLIB:-}" ]; then rm -f usr/lib; rmdir -p usr 2>&-; fi; \
- if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi
+ if [ -n "$${RM_SYSTEM:-}" ]; then rm -f System; fi; fi
# install tclsh symbolic link
@ln -fs ${TCLSH} ${INSTALL_ROOT}${BINDIR}/tclsh
endif