From 28a154347592fc15db3b95b43082b30833172515 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Feb 2019 23:22:35 +0000 Subject: mingw cross-compilation fixes from lscarso git-svn-id: svn://tug.org/texlive/trunk@49996 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/icu/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Build/source/libs/icu/Makefile.in') diff --git a/Build/source/libs/icu/Makefile.in b/Build/source/libs/icu/Makefile.in index 291223a732f..69488358540 100644 --- a/Build/source/libs/icu/Makefile.in +++ b/Build/source/libs/icu/Makefile.in @@ -89,6 +89,7 @@ build_triplet = @build@ host_triplet = @host@ @build_TRUE@am__append_1 = include/unicode @build_TRUE@check_PROGRAMS = icutest$(EXEEXT) +@cross_TRUE@am__append_2 = icu-build/lib/libicuuc.a subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -107,8 +108,7 @@ CONFIG_CLEAN_VPATH_FILES = am_icutest_OBJECTS = icutest-icutest.$(OBJEXT) icutest_OBJECTS = $(am_icutest_OBJECTS) icutest_LDADD = $(LDADD) -icutest_DEPENDENCIES = icu-build/lib/libicuuc.a \ - icu-build/lib/libicudata.a +icutest_DEPENDENCIES = icu-build/lib/libicuuc.a $(am__append_2) am__dist_check_SCRIPTS_DIST = icu.test AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -579,7 +579,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 $(ICU_LIBS_EXTRA) +LDADD = icu-build/lib/libicuuc.a $(am__append_2) $(ICU_LIBS_EXTRA) # Rebuild rebuild_prereq = @@ -1343,6 +1343,7 @@ check-makeflags: distclean-local: rm -rf icu-build icu-native +@cross_FALSE@icu-build/lib/libicudata.a rebuild.stamp: $(rebuild_target) echo timestamp >$@ -- cgit v1.2.3