You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/01/28 06:45:49 UTC
svn commit: r1236984 - in /trafficserver/traffic/trunk/mgmt/cli:
CliCreateCommands.cc Makefile.am
Author: jpeach
Date: Sat Jan 28 05:45:49 2012
New Revision: 1236984
URL: http://svn.apache.org/viewvc?rev=1236984&view=rev
Log:
TS-1097: Solaris can suck it
Modified:
trafficserver/traffic/trunk/mgmt/cli/CliCreateCommands.cc
trafficserver/traffic/trunk/mgmt/cli/Makefile.am
Modified: trafficserver/traffic/trunk/mgmt/cli/CliCreateCommands.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/CliCreateCommands.cc?rev=1236984&r1=1236983&r2=1236984&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/CliCreateCommands.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/CliCreateCommands.cc Sat Jan 28 05:45:49 2012
@@ -276,6 +276,18 @@ CliCreateCommands()
return CLI_OK;
}
+#if defined(__SUNPRO_CC)
+
+// Solaris doesn't like to link libstdc++ code. I don't have a system to test. Sorry.
+
+int
+Cmd_Help(ClientData, Tcl_Interp *, int, const char *[])
+{
+ return CMD_OK;
+}
+
+#else
+
struct replace_colon
{
char operator() (char c) const {
@@ -324,4 +336,6 @@ Cmd_Help(ClientData clientData, Tcl_Inte
return CMD_OK;
}
+#endif /* __SUNPRO_C */
+
// vim: set ts=2 sw=2 et :
Modified: trafficserver/traffic/trunk/mgmt/cli/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/Makefile.am?rev=1236984&r1=1236983&r2=1236984&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cli/Makefile.am Sat Jan 28 05:45:49 2012
@@ -88,6 +88,4 @@ traffic_line_LDADD = \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ \
- @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@ \
- -lstdc++
-
+ @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@