From de762468aa7258b8974174462ccb25f05a95f591 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 29 Apr 2006 20:13:07 +0000 Subject: [PATCH] We only need to add thread.c on non-WIN32 platforms, since get_home_path doesn't use pqGetpwuid on WIN32. Rather than try to figure out why it won't build on WIN32, just remove it. --- src/interfaces/ecpg/ecpglib/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 91542fe297..49c1070400 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.39 2006/04/28 02:53:20 tgl Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.40 2006/04/29 20:13:07 tgl Exp $ # #------------------------------------------------------------------------- @@ -25,9 +25,14 @@ override CFLAGS += $(PTHREAD_CFLAGS) LIBS := $(filter-out -lpgport, $(LIBS)) OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ - connect.o misc.o path.o exec.o thread.o \ + connect.o misc.o path.o exec.o \ $(filter snprintf.o, $(LIBOBJS)) +# thread.c is needed only for non-WIN32 implementation of path.c +ifneq ($(PORTNAME), win32) +OBJS += thread.o +endif + SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \ $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)