From a8bf2df829d2861fbc3b07f8dd1eb1186cb3b075 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 20 Jan 2010 23:12:03 +0000 Subject: [PATCH] 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 --- src/backend/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/Makefile b/src/backend/Makefile index 7a95139eb7..5916aaa511 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.140 2010/01/15 09:18:59 heikki Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.141 2010/01/20 23:12:03 tgl Exp $ # #------------------------------------------------------------------------- @@ -20,13 +20,13 @@ SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \ include $(srcdir)/common.mk -# As of 9/2009: -# * The probes.o file is necessary for dtrace support on Solaris. -# * OS X's dtrace doesn't use it and doesn't even recognize the -G option. -# * Systemtap's dtrace will take -G, but it produces a useless empty file. -# So, build probes.o only on Solaris. -# This will likely need adjustment as other platforms add dtrace support. -ifeq ($(PORTNAME), solaris) +# As of 1/2010: +# The probes.o file is necessary for dtrace support on Solaris, and on recent +# versions of systemtap. (Older systemtap releases just produce an empty +# file, but that's okay.) However, OS X's dtrace doesn't use it and doesn't +# even recognize the -G option. So, build probes.o except on Darwin. +# This might need adjustment as other platforms add dtrace support. +ifneq ($(PORTNAME), darwin) ifeq ($(enable_dtrace), yes) LOCALOBJS += utils/probes.o endif -- 2.11.0