5 files changed, 30 insertions, 0 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 97d68814116..7330caaf858 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -21,6 +21,11 @@ else
      CXXFLAGS		:= -g $(CXXFLAGS)
 endif
 
+#
+# C++ run-time libraries, necessary for linking some shared libraries.
+#
+CXXLIBS			=
+
 LDPLATFORMFLAGS		= -Wl,-bind_at_load -Wl,-executable_path,$(top_srcdir)/bin
 
 shlibldflags		= $(CXXFLAGS) -L$(libdir)
diff --git a/cpp/config/Make.rules.FreeBSD b/cpp/config/Make.rules.FreeBSD
index f33eb704b68..ad7477d2523 100644
--- a/cpp/config/Make.rules.FreeBSD
+++ b/cpp/config/Make.rules.FreeBSD
@@ -21,6 +21,11 @@ else
       CXXFLAGS		:= -g $(CXXFLAGS)
 endif
 
+#
+# C++ run-time libraries, necessary for linking some shared libraries.
+#
+CXXLIBS			=
+
 mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lc_r
 
 BASELIBS		= -lIceUtil -lc_r
diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX
index 3c30ab9d2b5..1bd51326fe8 100644
--- a/cpp/config/Make.rules.HP-UX
+++ b/cpp/config/Make.rules.HP-UX
@@ -38,6 +38,10 @@ else
      CXXFLAGS		:= -g0 $(CXXFLAGS)
 endif
 
+#
+# C++ run-time libraries, necessary for linking some shared libraries.
+#
+CXXLIBS			=
 
 #
 # On HP-UX, we need -L for all dependent libraries
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index 1605e3a483b..17a4d1ba2cd 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -68,6 +68,11 @@ ifeq ($(CXX),c++)
       CFLAGS                  := -O3 -mcpu=v8 -pipe -DNDEBUG -fPIC -DICE_USE_MUTEX_SHARED
    endif
 
+   #
+   # C++ run-time libraries, necessary for linking some shared libraries.
+   #
+   CXXLIBS		=
+
    mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread
 endif
 
@@ -86,6 +91,11 @@ ifeq ($(CXX),icc)
       CXXFLAGS		:= -g $(CXXFLAGS)
    endif
 
+   #
+   # C++ run-time libraries, necessary for linking some shared libraries.
+   #
+   CXXLIBS		=
+
    mkshlib                 = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) -lpthread
 endif
 
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS
index c250196058f..f558b3c4686 100644
--- a/cpp/config/Make.rules.SunOS
+++ b/cpp/config/Make.rules.SunOS
@@ -58,6 +58,12 @@ else
      CXXFLAGS		:= -g $(CXXFLAGS)
 endif
 
+#
+# C++ run-time libraries, necessary for linking some shared libraries.
+#
+CXXLIBS			= -lCstd -lCrun
+
+
 mkshlib                 = $(CXX) -G $(LDFLAGS) -o $(1) -h $(2) $(3) $(4)
 
 BASELIBS		= -lIceUtil $(STLPORT_LIBS) -lpthread