diff options
Diffstat (limited to 'external/icu/icu4c-link-scrptrun.patch.2')
| -rw-r--r-- | external/icu/icu4c-link-scrptrun.patch.2 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/external/icu/icu4c-link-scrptrun.patch.2 b/external/icu/icu4c-link-scrptrun.patch.2 new file mode 100644 index 000000000000..8c94361a163c --- /dev/null +++ b/external/icu/icu4c-link-scrptrun.patch.2 @@ -0,0 +1,43 @@ +Based on: https://github.com/unicode-org/icu/commit/e3f2c0dd70018d924bf22a9b3f0cbf387316b50b.patch + +From e3f2c0dd70018d924bf22a9b3f0cbf387316b50b Mon Sep 17 00:00:00 2001 +From: Paul Smith <paul@mad-scientist.net> +Date: Wed, 5 Aug 2020 13:18:30 -0400 +Subject: [PATCH] ICU-21217 Windows: Fix link command for extra/scrptrun + +--- + icu4c/source/extra/scrptrun/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/icu4c/source/extra/scrptrun/Makefile.in b/icu4c/source/extra/scrptrun/Makefile.in +index f6e47735631..d951f66a4bd 100644 +--- a/icu4c/source/extra/scrptrun/Makefile.in ++++ b/icu4c/source/extra/scrptrun/Makefile.in +@@ -12,9 +12,6 @@ + + include $(top_builddir)/icudefs.mk + +-## Platform-specific setup +-include @platform_make_fragment@ +- + ## Build directory information + subdir = extra/scrptrun + +@@ -33,7 +33,7 @@ ifeq ($(ENABLE_RPATH),YES) + RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) + endif + LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) +-LIBS = $(LIBICUUC) @LIBS@ @LIB_M@ ++LIBS = $(LIBICUUC) $(LIB_M) + + OBJECTS = scrptrun.o srtest.o + +@@ -75,7 +75,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + $(TARGET) : $(OBJECTS) +- $(LINK.cc) -o $@ $^ $(LIBS) ++ $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS) + $(POST_BUILD_STEP) + + invoke: |