Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a8bf2df

Browse files
committed
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
1 parent 41a4e45 commit a8bf2df

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/backend/Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.140 2010/01/15 09:18:59 heikki Exp $
8+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.141 2010/01/20 23:12:03 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -20,13 +20,13 @@ SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \
2020

2121
include $(srcdir)/common.mk
2222

23-
# As of 9/2009:
24-
# * The probes.o file is necessary for dtrace support on Solaris.
25-
# * OS X's dtrace doesn't use it and doesn't even recognize the -G option.
26-
# * Systemtap's dtrace will take -G, but it produces a useless empty file.
27-
# So, build probes.o only on Solaris.
28-
# This will likely need adjustment as other platforms add dtrace support.
29-
ifeq ($(PORTNAME), solaris)
23+
# As of 1/2010:
24+
# The probes.o file is necessary for dtrace support on Solaris, and on recent
25+
# versions of systemtap. (Older systemtap releases just produce an empty
26+
# file, but that's okay.) However, OS X's dtrace doesn't use it and doesn't
27+
# even recognize the -G option. So, build probes.o except on Darwin.
28+
# This might need adjustment as other platforms add dtrace support.
29+
ifneq ($(PORTNAME), darwin)
3030
ifeq ($(enable_dtrace), yes)
3131
LOCALOBJS += utils/probes.o
3232
endif

0 commit comments

Comments
 (0)