From: Michael Ow <mow@svn.icu-project.org>
Date: Fri, 9 Mar 2012 19:40:54 +0000 (+0000)
Subject: ICU-9178 Fix Cygwin MSVC static build failure
X-Git-Tag: milestone-59-0-1~3916
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c844ff89a72b158f36a04bbadf8a9a407afa559;p=icu

ICU-9178 Fix Cygwin MSVC static build failure

X-SVN-Rev: 31610
---

diff --git a/icu4c/source/tools/pkgdata/pkgdata.cpp b/icu4c/source/tools/pkgdata/pkgdata.cpp
index 91dfa48123a..74e06e7fa32 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.cpp
+++ b/icu4c/source/tools/pkgdata/pkgdata.cpp
@@ -1542,11 +1542,12 @@ static int32_t pkg_createWindowsDLL(const char mode, const char *gencFilePath, U
     if (IN_STATIC_MODE(mode)) {
         char staticLibFilePath[SMALL_BUFFER_MAX_SIZE] = "";
 
-        uprv_strcpy(staticLibFilePath, o->tmpDir);
-        uprv_strcat(staticLibFilePath, PKGDATA_FILE_SEP_STRING);
-
-        uprv_strcat(staticLibFilePath, o->entryName);
-        uprv_strcat(staticLibFilePath, LIB_EXT);
+        sprintf(staticLibFilePath, "%s%s%s%s%s",
+                o->targetDir,
+                PKGDATA_FILE_SEP_STRING,
+                (strstr(o->libName, "icudt") ? "s" : ""),
+                o->libName,
+                LIB_EXT);
 
         sprintf(cmd, "%s\"%s\" \"%s\"",
                 LIB_CMD,