mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-11-27 07:21:09 +08:00
Allow --enable-thread-safety with --disable-shared libraries by passing
PTHREAD_LIBS to all libpq-usage builds.
This commit is contained in:
parent
b5498167d7
commit
d0c01f29df
@ -1,5 +1,5 @@
|
|||||||
# -*-makefile-*-
|
# -*-makefile-*-
|
||||||
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.206 2004/12/16 17:48:29 momjian Exp $
|
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.207 2004/12/16 18:13:07 momjian Exp $
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# All PostgreSQL makefiles include this file and use the variables it sets,
|
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||||
@ -308,11 +308,17 @@ endif
|
|||||||
|
|
||||||
libpq = -L$(libpq_builddir) -lpq
|
libpq = -L$(libpq_builddir) -lpq
|
||||||
|
|
||||||
|
# If doing static linking, shared library dependency can't be
|
||||||
|
# used so we specify pthread libs for every usage of libpq
|
||||||
|
ifeq ($(enable_shared), no)
|
||||||
|
libpq += $(PTHREAD_LIBS)
|
||||||
|
else
|
||||||
# AIX libraries do not remember their required libs so we have to force
|
# AIX libraries do not remember their required libs so we have to force
|
||||||
# thread dependent libraires in the link
|
# thread dependent libraires in the link
|
||||||
ifeq ($(PORTNAME), aix)
|
ifeq ($(PORTNAME), aix)
|
||||||
libpq += $(PTHREAD_LIBS)
|
libpq += $(PTHREAD_LIBS)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
submake-libpq:
|
submake-libpq:
|
||||||
$(MAKE) -C $(libpq_builddir) all
|
$(MAKE) -C $(libpq_builddir) all
|
||||||
|
Loading…
Reference in New Issue
Block a user