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

Commit 0fd7646

Browse files
committed
Make hstore_plperl's build even more like plperl's
Combine the two places that set CPPFLAGS into one. Also, some settings should be restricted to Windows only. More precisely, -Wno-comment is a GCC-only option, but Windows in a makefile implies GCC at the moment. Also, since -Wno-comment is more properly a preprocessor option, move it to CPPFLAGS to simplify things a bit.
1 parent d664a10 commit 0fd7646

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

contrib/hstore_plperl/Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
MODULE_big = hstore_plperl
44
OBJS = hstore_plperl.o
55

6-
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore
6+
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plperl -I$(top_srcdir)/contrib/hstore -I$(perl_archlibexp)/CORE
7+
8+
# see plperl
9+
ifeq ($(PORTNAME), win32)
10+
PG_CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
11+
endif
712

813
EXTENSION = hstore_plperl hstore_plperlu
914
DATA = hstore_plperl--1.0.sql hstore_plperlu--1.0.sql
@@ -21,6 +26,3 @@ top_builddir = ../..
2126
include $(top_builddir)/src/Makefile.global
2227
include $(top_srcdir)/contrib/contrib-global.mk
2328
endif
24-
25-
override CPPFLAGS := $(CPPFLAGS) -I$(perl_archlibexp)/CORE -DPLPERL_HAVE_UID_GID
26-
override CFLAGS += -Wno-comment

src/pl/plperl/GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ifeq ($(PORTNAME), win32)
99
override CPPFLAGS += -DPLPERL_HAVE_UID_GID
1010
# Perl on win32 contains /* within comment all over the header file,
1111
# so disable this warning.
12-
override CFLAGS += -Wno-comment
12+
override CPPFLAGS += -Wno-comment
1313
endif
1414

1515
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -I$(perl_archlibexp)/CORE

0 commit comments

Comments
 (0)