Commit 3cd77da3 authored by Bruce Momjian's avatar Bruce Momjian

Build server libpgport with all non-FRONTEND object files. This is to

fix a Win32 bug where pipe.c included a file that used FRONTEND, but it
wasn't on the server-build list.
parent 5749f6ef
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# for use only by the backend binaries # for use only by the backend binaries
# #
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/port/Makefile,v 1.30 2005/12/09 21:19:36 petere Exp $ # $PostgreSQL: pgsql/src/port/Makefile,v 1.31 2006/05/08 02:18:50 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -26,12 +26,8 @@ include $(top_builddir)/src/Makefile.global ...@@ -26,12 +26,8 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS) override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
LIBS += $(PTHREAD_LIBS) LIBS += $(PTHREAD_LIBS)
# Replace object files that use FRONTEND define # Replace all object files so they use FRONTEND define
LIBOBJS_SRV := $(LIBOBJS) LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
LIBOBJS_SRV := $(patsubst dirmod.o,dirmod_srv.o, $(LIBOBJS_SRV))
LIBOBJS_SRV := $(patsubst exec.o,exec_srv.o, $(LIBOBJS_SRV))
LIBOBJS_SRV := $(patsubst getaddrinfo.o,getaddrinfo_srv.o, $(LIBOBJS_SRV))
LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))
all: libpgport.a libpgport_srv.a all: libpgport.a libpgport_srv.a
...@@ -60,13 +56,7 @@ path.o: path.c pg_config_paths.h ...@@ -60,13 +56,7 @@ path.o: path.c pg_config_paths.h
libpgport_srv.a: $(LIBOBJS_SRV) libpgport_srv.a: $(LIBOBJS_SRV)
$(AR) $(AROPT) $@ $^ $(AR) $(AROPT) $@ $^
dirmod_srv.o: dirmod.c %_srv.o: %.c
$(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
exec_srv.o: exec.c
$(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
getaddrinfo_srv.o: getaddrinfo.c
$(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@ $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
# No thread flags for server version # No thread flags for server version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment