diff options
Diffstat (limited to 'cpp/test/Ice/stringConverter')
| -rw-r--r-- | cpp/test/Ice/stringConverter/Client.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/stringConverter/Makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/stringConverter/Client.cpp b/cpp/test/Ice/stringConverter/Client.cpp index bc746df14ca..e32b6e51dbe 100644 --- a/cpp/test/Ice/stringConverter/Client.cpp +++ b/cpp/test/Ice/stringConverter/Client.cpp @@ -55,7 +55,7 @@ Client::run(int argc, char** argv) narrowEncoding = "iso815"; wideEncoding = "ucs4"; -#elif defined(_AIX) +#elif defined(_AIX) && !defined(_LIBICONV_VERSION) // Always big-endian narrowEncoding = "ISO8859-15"; diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk index 22c6a4d2ef0..3ca7713a6b9 100644 --- a/cpp/test/Ice/stringConverter/Makefile.mk +++ b/cpp/test/Ice/stringConverter/Makefile.mk @@ -2,6 +2,6 @@ # Copyright (c) ZeroC, Inc. All rights reserved. # -$(test)_ldflags = $(iconv_ldflags) +$(test)_libs = iconv tests += $(test) |