diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-07-15 05:14:32 -0400 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-07-15 11:14:32 +0200 |
| commit | 2e60ce8af12b12a8c1aed18c7bea2413016d4004 (patch) | |
| tree | 4f5f578bb99ea4713cbc1d0e57346b6036c70f10 /cpp/test/Ice/stringConverter | |
| parent | Test script minor warning fixes (diff) | |
| download | ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.tar.bz2 ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.tar.xz ice-2e60ce8af12b12a8c1aed18c7bea2413016d4004.zip | |
Port to AIX with g++, xlC_r and xlclang++ (#434)
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) |