Skip to content

Commit e3b3878

Browse files
committed
Put back "ifeq ($(PORTNAME), solaris)", this time with some documentation
of why it's not as broken as it appears on first glance.
1 parent db13a81 commit e3b3878

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/backend/Makefile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.135 2009/09/04 23:11:05 tgl Exp $
8+
# $PostgreSQL: pgsql/src/backend/Makefile,v 1.136 2009/09/05 21:14:04 tgl Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -20,9 +20,17 @@ 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)
2330
ifeq ($(enable_dtrace), yes)
2431
LOCALOBJS += utils/probes.o
2532
endif
33+
endif
2634

2735
OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a
2836

0 commit comments

Comments
 (0)