mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:11:53 +02:00
Build src/port/dirmod.c only on Windows.
Since commit ba7c5975ad
, 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.
This commit is contained in:
parent
df9ebf1eea
commit
91f4a5a976
6
configure
vendored
6
configure
vendored
@ -12083,6 +12083,12 @@ esac
|
||||
fi
|
||||
|
||||
|
||||
case " $LIBOBJS " in
|
||||
*" dirmod.$ac_objext "* ) ;;
|
||||
*) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
|
||||
;;
|
||||
esac
|
||||
|
||||
case " $LIBOBJS " in
|
||||
*" kill.$ac_objext "* ) ;;
|
||||
*) LIBOBJS="$LIBOBJS kill.$ac_objext"
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user