diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-20 23:12:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-20 23:12:15 +0000 |
| commit | 5f608958ff2f9189c81bc2bde0713aed31507cdf (patch) | |
| tree | b67b2176d40b1c0e0492b48046d76be25582cb8c /src | |
| parent | 3fc333d88a334920a17c898008535cbe76ebf221 (diff) | |
| download | postgresql-5f608958ff2f9189c81bc2bde0713aed31507cdf.tar.gz postgresql-5f608958ff2f9189c81bc2bde0713aed31507cdf.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 1872a9ae3fc..1fb3468d0d4 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group # 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 -# 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 |