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:55 -0400 |
| commit | f221c44cda52c324ced27e3b1fbec3458a2683d4 (patch) | |
| tree | a23d3177a23345ade65567c56708747dbe5d5bc8 /src | |
| parent | e8528a8f5d411f0d9a1a9f927eae332992949aa1 (diff) | |
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 5caf1dc0804..1d90e44dcae 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 3 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 cab4db18bc3..5c11c19eb73 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -18,7 +18,7 @@ SO_MAJOR_VERSION= 3 SO_MINOR_VERSION= 2 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 360e97a4419..ccd328bef7e 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -249,6 +249,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'); |