From e3b3878a0815e8c30fd4fd7050ab084688bbfe79 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 5 Sep 2009 21:14:04 +0000 Subject: [PATCH] Put back "ifeq ($(PORTNAME), solaris)", this time with some documentation of why it's not as broken as it appears on first glance. --- src/backend/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/backend/Makefile b/src/backend/Makefile index 3ac64bf4ab..fe0fede4bf 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 -- 2.40.0