Well, the systemtap guys moved the goalposts again: with the latest version,

we *must* generate probes.o or the dtrace probes don't work.  Revert our
workaround for their previous bug.  Details at
https://bugzilla.redhat.com/show_bug.cgi?id=557266
This commit is contained in:
Tom Lane 2010-01-20 23:12:15 +00:00
parent 3fc333d88a
commit 5f608958ff

View File

@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.132.2.2 2009/09/05 21:14:13 tgl Exp $ # $PostgreSQL: pgsql/src/backend/Makefile,v 1.132.2.3 2010/01/20 23:12:15 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -20,13 +20,13 @@ SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \
include $(srcdir)/common.mk include $(srcdir)/common.mk
# As of 9/2009: # As of 1/2010:
# * The probes.o file is necessary for dtrace support on Solaris. # The probes.o file is necessary for dtrace support on Solaris, and on recent
# * OS X's dtrace doesn't use it and doesn't even recognize the -G option. # versions of systemtap. (Older systemtap releases just produce an empty
# * Systemtap's dtrace will take -G, but it produces a useless empty file. # file, but that's okay.) However, OS X's dtrace doesn't use it and doesn't
# So, build probes.o only on Solaris. # even recognize the -G option. So, build probes.o except on Darwin.
# This will likely need adjustment as other platforms add dtrace support. # This might need adjustment as other platforms add dtrace support.
ifeq ($(PORTNAME), solaris) ifneq ($(PORTNAME), darwin)
ifeq ($(enable_dtrace), yes) ifeq ($(enable_dtrace), yes)
LOCALOBJS += utils/probes.o LOCALOBJS += utils/probes.o
endif endif