summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2009-11-29 08:46:38 (GMT)
committerdas <das>2009-11-29 08:46:38 (GMT)
commitdb7bb18efce7421bb11eaea01689691a2b53f48b (patch)
treea8f16c6fafb2c03bc3ee6e79791cccc4f9560d21
parentd8b589ccb61ee3efe3554992135b24a44cad07c3 (diff)
downloadtcl-db7bb18efce7421bb11eaea01689691a2b53f48b.zip
tcl-db7bb18efce7421bb11eaea01689691a2b53f48b.tar.gz
tcl-db7bb18efce7421bb11eaea01689691a2b53f48b.tar.bz2
reverted 2902965 changes that broke static builds on OSX
-rw-r--r--unix/Makefile.in4
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
3 files changed, 6 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index b4a4566..c184c78 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.283 2009/11/26 09:40:32 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.284 2009/11/29 08:46:38 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -615,7 +615,7 @@ tclLibObjs:
objs: ${OBJS}
tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \
+ ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
${CC_SEARCH_FLAGS} -o tclsh
Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in
diff --git a/unix/configure b/unix/configure
index f8dcb5e..991879c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8971,12 +8971,12 @@ else
if test "$RANLIB" = ""; then
- MAKE_LIB='$(STLIB_LD) $@ ${OBJS} ${STUB_LIB_OBJS}'
+ MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
else
- MAKE_LIB='${STLIB_LD} $@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} $@'
+ MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index d315658..6c23ace 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2066,10 +2066,10 @@ dnl # preprocessing tests use only CPPFLAGS.
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
AS_IF([test "$RANLIB" = ""], [
- MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS} ${STUB_LIB_OBJS}'
+ MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS}'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
], [
- MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
+ MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
])
])