From 8bc208cd9a54b6c3d9229ec0f6efb9eb009b6c6d Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Wed, 5 May 2004 04:15:32 +0000 Subject: [PATCH] ICU-3576 Improve static library building ability X-SVN-Rev: 15151 --- icu4c/source/config/mh-cygwin | 4 ++++ icu4c/source/tools/genccode/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/icu4c/source/config/mh-cygwin b/icu4c/source/config/mh-cygwin index 0f60d87af9f..cd7942ce94b 100644 --- a/icu4c/source/config/mh-cygwin +++ b/icu4c/source/config/mh-cygwin @@ -19,6 +19,10 @@ SHAREDLIBCPPFLAGS = -DPIC LIBCPPFLAGS = -D_REENTRANT THREADSCPPFLAGS = -D_REENTRANT +# Commands to link. Link with C++ in case static libraries are used. +LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) +#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) + ## Commands to make a shared library SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index f301a9c3e73..cffd2dab6a0 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -31,7 +31,7 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) -LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) $(LIBICUTOOLUTIL) +LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genccode.o