diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-03-14 14:08:45 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-03-14 14:08:45 -0400 |
| commit | 91f4a5a976500517e492320e389342d7436cf9d4 (patch) | |
| tree | 30c1c43406ad158548a884eaa173417b218990c8 | |
| parent | df9ebf1eeaf98481e00cd77bf6056d42310731b7 (diff) | |
Build src/port/dirmod.c only on Windows.
Since commit ba7c5975adea74c6f17bdb0e0427ad85962092a2, port/dirmod.c
has contained only Windows-specific functions. Most platforms don't
seem to mind uselessly building an empty file, but OS X for one issues
warnings. Hence, treat dirmod.c as a Windows-specific file selected
by configure rather than one that's always built. We can revert this
change if dirmod.c ever gains any non-Windows functionality again.
Back-patch to 9.4 where the mentioned commit appeared.
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | src/include/port.h | 2 | ||||
| -rw-r--r-- | src/port/Makefile | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure index fa271fe4ebe..ddbda1cddf6 100755 --- a/configure +++ b/configure @@ -12084,6 +12084,12 @@ fi case " $LIBOBJS " in + *" dirmod.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS dirmod.$ac_objext" + ;; +esac + + case " $LIBOBJS " in *" kill.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS kill.$ac_objext" ;; diff --git a/configure.in b/configure.in index e6a49d123b6..a023727ebae 100644 --- a/configure.in +++ b/configure.in @@ -1439,6 +1439,7 @@ fi # Win32 support if test "$PORTNAME" = "win32"; then AC_REPLACE_FUNCS(gettimeofday) + AC_LIBOBJ(dirmod) AC_LIBOBJ(kill) AC_LIBOBJ(open) AC_LIBOBJ(system) diff --git a/src/include/port.h b/src/include/port.h index b64651f1665..29854dd752e 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -61,7 +61,7 @@ extern void get_man_path(const char *my_exec_path, char *ret_path); extern bool get_home_path(char *ret_path); extern void get_parent_directory(char *path); -/* port/dirmod.c */ +/* common/pgfnames.c */ extern char **pgfnames(const char *path); extern void pgfnames_cleanup(char **filenames); diff --git a/src/port/Makefile b/src/port/Makefile index 05112eb6e61..abc42a22267 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -30,7 +30,7 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS) LIBS += $(PTHREAD_LIBS) -OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o inet_net_ntop.o \ +OBJS = $(LIBOBJS) chklocale.o erand48.o inet_net_ntop.o \ noblock.o path.o pgcheckdir.o pgmkdirp.o pgsleep.o \ pgstrcasecmp.o pqsignal.o \ qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o |