diff options
| author | Noah Misch <noah@leadboat.com> | 2015-04-24 19:29:02 -0400 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-04-24 19:29:02 -0400 |
| commit | 151e74719b0cc5c040bd3191b51b95f925773dd1 (patch) | |
| tree | fba74a03a4544ca3b9e7731e03edbdfd9649a33a /src | |
| parent | 732b33f8ae4ecc9d7a9f07fd4cb74a60a2a5e2c2 (diff) | |
| download | postgresql-151e74719b0cc5c040bd3191b51b95f925773dd1.tar.gz postgresql-151e74719b0cc5c040bd3191b51b95f925773dd1.zip | |
Build every ECPG library with -DFRONTEND.
Each of the libraries incorporates src/port files, which often check
FRONTEND. Build systems disagreed on whether to build libpgtypes this
way. Only libecpg incorporates files that rely on it today. Back-patch
to 9.0 (all supported versions) to forestall surprises.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/compatlib/Makefile | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/pgtypeslib/Makefile | 2 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index ce01df356ce..e0b0474ada1 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 7 override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \ - -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS) + -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils -DFRONTEND $(CPPFLAGS) override CFLAGS += $(PTHREAD_CFLAGS) SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \ diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index 80595b1021b..52c83be3c0f 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -19,7 +19,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 6 override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \ - -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS) + -I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS) override CFLAGS += $(PTHREAD_CFLAGS) # Need to recompile any libpgport object files diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 8654bfe3ce7..9d0cf8d01ec 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -354,6 +354,7 @@ sub mkvcbuild my $libecpgcompat = $solution->AddProject( 'libecpg_compat', 'dll', 'interfaces', 'src\interfaces\ecpg\compatlib'); + $libecpgcompat->AddDefine('FRONTEND'); $libecpgcompat->AddIncludeDir('src\interfaces\ecpg\include'); $libecpgcompat->AddIncludeDir('src\interfaces\libpq'); $libecpgcompat->UseDef('src\interfaces\ecpg\compatlib\compatlib.def'); |