Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0fd7646

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

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

‎contrib/hstore_plperl/Makefile

Lines changed: 6 additions & 4 deletions
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-
overrideCPPFLAGS :=$(CPPFLAGS) -I$(perl_archlibexp)/CORE -DPLPERL_HAVE_UID_GID
26-
overrideCFLAGS += -Wno-comment

‎src/pl/plperl/GNUmakefile

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

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp