diff options
| author | das <das> | 2008-06-12 06:33:55 (GMT) |
|---|---|---|
| committer | das <das> | 2008-06-12 06:33:55 (GMT) |
| commit | 8958a8393b94c6f685698760a5527e3a8031b861 (patch) | |
| tree | e6315e0dd3d8118c1b48cfc9725ac49fb3aca5c9 /unix | |
| parent | efb023ae79a5edd0667b94728ca2191d379b2fe9 (diff) | |
| download | tcl-8958a8393b94c6f685698760a5527e3a8031b861.zip tcl-8958a8393b94c6f685698760a5527e3a8031b861.tar.gz tcl-8958a8393b94c6f685698760a5527e3a8031b861.tar.bz2 | |
* unix/configure.in: fix static DTrace-enabled build on Solaris.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/configure.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/unix/configure.in b/unix/configure.in index 31dc1cf..7bcbb0e 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.180.2.2 2008/04/11 18:12:30 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.180.2.3 2008/06/12 06:33:55 das Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.59) @@ -663,6 +663,15 @@ if test $tcl_ok = yes; then DTRACE_HDR="\${DTRACE_HDR}" if test "`uname -s`" != "Darwin" ; then DTRACE_OBJ="\${DTRACE_OBJ}" + if test "`uname -s`" = "SunOS" -a "$SHARED_BUILD" = "0" ; then + # Need to create an intermediate object file to ensure tclDTrace.o + # gets included when linking against the static tcl library. + STLIB_LD='stlib_ld () { /usr/ccs/bin/ld -r -o $${1%.a}.o "$${@:2}" && '"${STLIB_LD}"' $${1} $${1%.a}.o ; } && stlib_ld' + # Force use of Sun ar and ranlib, the GNU versions choke on + # tclDTrace.o and the combined object file above. + AR='/usr/ccs/bin/ar' + RANLIB='/usr/ccs/bin/ranlib' + fi fi fi AC_MSG_RESULT([$tcl_ok]) |