summaryrefslogtreecommitdiff
path: root/Build/source/libs/icu
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-27 21:38:29 +0000
committerKarl Berry <karl@freefriends.org>2017-04-27 21:38:29 +0000
commit0b331b657051a55ba5f567f66f301f93d215743b (patch)
treee78906d139cb8c0ed2d3079559c932692f57bc17 /Build/source/libs/icu
parent1a979118b3cc992840d9795d1c9be465160b8b1d (diff)
ICU_EXTRA_LIBS for icutest; doc
git-svn-id: svn://tug.org/texlive/trunk@44086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu')
-rw-r--r--Build/source/libs/icu/ChangeLog5
-rw-r--r--Build/source/libs/icu/Makefile.am3
-rw-r--r--Build/source/libs/icu/Makefile.in2
3 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index 2d64ed9a2c1..196187e7fd6 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-27 Karl Berry <karl@tug.org>
+
+ * Makefile.am (LDADD): link icutest with ICU_LIBS_EXTRA.
+
2017-03-13 Karl Berry <karl@freefriends.org>
* Import icu-58.2 (release); reautoconf.
@@ -195,4 +199,3 @@
2009-01-28 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapt to TL2009 build system.
-
diff --git a/Build/source/libs/icu/Makefile.am b/Build/source/libs/icu/Makefile.am
index d96452f44cc..97feca96864 100644
--- a/Build/source/libs/icu/Makefile.am
+++ b/Build/source/libs/icu/Makefile.am
@@ -84,7 +84,7 @@ nodist_EXTRA_icutest_SOURCES = dummy.cxx
icutest_CPPFLAGS = -Iinclude
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
# Rebuild
rebuild_prereq =
@@ -92,4 +92,3 @@ rebuild_target = icubuild
CLEANFILES =
include $(srcdir)/../../am/rebuild.am
-
diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in
index 882054d6d97..04ec504345c 100644
--- a/Build/source/libs/icu/Makefile.in
+++ b/Build/source/libs/icu/Makefile.in
@@ -576,7 +576,7 @@ icutest_SOURCES = icutest.c
# Force Automake to use CXXLD for linking
nodist_EXTRA_icutest_SOURCES = dummy.cxx
icutest_CPPFLAGS = -Iinclude
-LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a
+LDADD = icu-build/lib/libicuuc.a icu-build/lib/libicudata.a $(ICU_LIBS_EXTRA)
# Rebuild
rebuild_prereq =