ICU: fix: do not make pg_upgrade with wchar.c and -DFRONTEND

Use wchar.c frontend functions from fe_utils.

Author: Marina Polyakova

src/bin/pg_upgrade/.gitignore

@@ -1,5 +1,4 @@
 /pg_upgrade
-/wchar.c
 # Generated by test suite
 /analyze_new_cluster.sh
 /delete_old_cluster.sh

src/bin/pg_upgrade/Makefile

@@ -9,9 +9,9 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = check.o controldata.o dump.o exec.o file.o function.o info.o \
        option.o parallel.o pg_upgrade.o relfilenode.o server.o \
-       tablespace.o util.o version.o wchar.o $(WIN32RES)
+       tablespace.o util.o version.o $(WIN32RES)
 
-override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -DFRONTEND -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
+override CPPFLAGS := -DDLSUFFIX=\"$(DLSUFFIX)\" -I$(srcdir) -I$(libpq_srcdir) $(CPPFLAGS)
 override LDFLAGS := -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport) $(ICU_LIBS) $(LDFLAGS)
 
 
@@ -20,13 +20,6 @@ all: pg_upgrade
 pg_upgrade: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
 	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
-# Pull in wchar.c from src/backend/utils/mb. That exposes us to
-# risks of version skew if we link to a shared library. Do it the
-# hard way, instead, so that we're statically linked.
-
-wchar.c: % : $(top_srcdir)/src/backend/utils/mb/%
-	rm -f $@ && $(LN_S) $< .
-
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_upgrade$(X) '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
 
@@ -42,7 +35,6 @@ clean distclean maintainer-clean:
 	       loadable_libraries.txt reindex_hash.sql \
 	       pg_upgrade_dump_globals.sql \
 	       pg_upgrade_dump_*.custom pg_upgrade_*.log
-	rm -f wchar.c
 
 check: test.sh all
 	MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) EXTRA_REGRESS_OPTS="$(EXTRA_REGRESS_OPTS)" $(SHELL) $< --install

src/tools/msvc/Mkvcbuild.pm

@@ -58,7 +58,6 @@ my @contrib_excludes = (
 my $frontend_defines = {
 	'initdb'     => 'FRONTEND',
 	'psql'       => 'FRONTEND',
-	'pg_upgrade' => 'FRONTEND',
 	'pg_dump'    => 'FRONTEND',
         'pg_dumpall' => 'FRONTEND',
         'pg_restore' => 'FRONTEND',