aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-09-05 21:14:04 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-09-05 21:14:04 +0000
commite3b3878a0815e8c30fd4fd7050ab084688bbfe79 (patch)
tree639e29616981b58b114df8fd7e2f740de8c24257 /src
parentdb13a81ab44f5ead85a4e77b30006c81bb6d20af (diff)
downloadpostgresql-e3b3878a0815e8c30fd4fd7050ab084688bbfe79.tar.gz
postgresql-e3b3878a0815e8c30fd4fd7050ab084688bbfe79.zip
Put back "ifeq ($(PORTNAME), solaris)", this time with some documentation
of why it's not as broken as it appears on first glance.
Diffstat (limited to 'src')
-rw-r--r--src/backend/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 3ac64bf4abb..fe0fede4bf9 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.135 2009/09/04 23:11:05 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.136 2009/09/05 21:14:04 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -20,9 +20,17 @@ 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)
ifeq ($(enable_dtrace), yes)
LOCALOBJS += utils/probes.o
endif
+endif
OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a