summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-05-12 17:37:14 +0200
committerJose <jose@zeroc.com>2014-05-12 17:37:14 +0200
commitc3f5816563bce20a8e5594a7bb3a656b8336f46c (patch)
tree02dc000b76bd52f97b6b8b18776da85b4d16c0f9 /cpp
parentFixed logger on Windows to flush stderr after fprintf_s (diff)
downloadice-c3f5816563bce20a8e5594a7bb3a656b8336f46c.tar.bz2
ice-c3f5816563bce20a8e5594a7bb3a656b8336f46c.tar.xz
ice-c3f5816563bce20a8e5594a7bb3a656b8336f46c.zip
test/Ice/StringConverter OS X build fix
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/stringConverter/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/test/Ice/stringConverter/Makefile b/cpp/test/Ice/stringConverter/Makefile
index c86cfb4a3b5..2f261350f16 100644
--- a/cpp/test/Ice/stringConverter/Makefile
+++ b/cpp/test/Ice/stringConverter/Makefile
@@ -28,14 +28,16 @@ SLICE_SRCS = Test.ice
include $(top_srcdir)/config/Make.rules
+LINKWITH = $(LIBS) $(ICONV_LIBS)
+
CPPFLAGS := -I. -I../../include $(CPPFLAGS)
$(CLIENT): $(COBJS)
rm -f $@
- $(call mktest,$@,$(COBJS),$(OPENSSL_RPATH_LINK) $(ICESSL_LIBS) $(ICEWS_LIBS))
+ $(call mktest,$@,$(COBJS),$(OPENSSL_RPATH_LINK) $(LINKWITH))
$(SERVER): $(SOBJS)
rm -f $@
- $(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(ICEWS_LIBS))
+ $(call mktest,$@,$(SOBJS),$(LINKWITH))
include .depend