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

Commitcb36f8e

Browse files
committed
Fix order of -I switches for building pg_regress.o.
We need the -I switch for libpq_srcdir to come before any -I switchesinjected by configure. Otherwise there is a risk of pulling in amismatched version of libpq_fe.h from someplace like/usr/local/include, if the platform has another Postgres versioninstalled there. This evidently accounts for today's buildfarmfailures on "anaconda".In principle the -I switch for src/port/ is at similar hazard, and hasbeen for a very long time. But the only .h files we keep there arepg_config_paths.h and pthread-win32.h, neither of which get installedon Unix-ish systems, so the odds of picking up a conflicting headerseem pretty small. That doubtless accounts for the lack of priorreports.Back-patch to v17 where pg_regress acquired a build dependency onlibpq_fe.h. We could go back further to fix the hazard for src/port/in older branches, but it seems unlikely to be worth troubling over.Reported-by: Nathan Bossart <nathandbossart@gmail.com>Author: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/Z-MhRzoc7t-nPUQG@nathanBackpatch-through: 17
1 parent3430215 commitcb36f8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎src/test/regress/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pg_regress$(X): pg_regress.o pg_regress_main.o $(WIN32RES) | submake-libpgport
4040

4141
# dependencies ensure that path changes propagate
4242
pg_regress.o: pg_regress.c$(top_builddir)/src/port/pg_config_paths.h
43-
pg_regress.o: override CPPFLAGS+= -I$(top_builddir)/src/port -I$(libpq_srcdir)$(EXTRADEFS)
43+
pg_regress.o: override CPPFLAGS:= -I$(top_builddir)/src/port -I$(libpq_srcdir)$(EXTRADEFS)$(CPPFLAGS)
4444

4545
# note: because of the submake dependency, this rule's action is really a no-op
4646
$(top_builddir)/src/port/pg_config_paths.h: | submake-libpgport

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp