database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-28 11:44:57 +03:00
Code Activity

Simplify passing of configure arguments to pg_config

Browse Source 
The previous system had configure put the value into the makefiles and
then have the makefiles pass them to the build of pg_config.  That was
put in place when pg_config was a shell script.  We can simplify that
by having configure put the value into pg_config.h directly.  This
also makes the standard build system match how the MSVC build system
already does it.

Discussion: https://www.postgresql.org/message-id/flat/6e457870-cef5-5f1d-b57c-fc89cfb8a788%402ndquadrant.com
This commit is contained in:
Peter Eisentraut
2020-02-10 17:12:46 +01:00
parent 11de6c903d
commit b691c189c6
7 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/msvc/Solution.pm
View File

@@ -195,6 +195,7 @@ sub GenerateFiles
ALIGNOF_SHORT => 2,
AC_APPLE_UNIVERSAL_BUILD => undef,
BLCKSZ => 1024 * $self->{options}->{blocksize},
CONFIGURE_ARGS => '"' . $self->GetFakeConfigure() . '"',
DEF_PGPORT => $port,
DEF_PGPORT_STR => qq{"$port"},
ENABLE_GSS => $self->{options}->{gss} ? 1 : undef,
@@ -538,12 +539,6 @@ sub GenerateFiles
$self->GenerateConfigHeader('src/include/pg_config_ext.h', \%define, 0);
$self->GenerateConfigHeader('src/interfaces/ecpg/include/ecpg_config.h', \%define, 0);
open(my $f, '>>', 'src/include/pg_config.h')
|| confess "Could not write to src/include/pg_config.h\n";
print $f "\n";
print $f "#define VAL_CONFIGURE \"" . $self->GetFakeConfigure() . "\"\n";
close($f);
$self->GenerateDefFile(
"src/interfaces/libpq/libpqdll.def",
"src/interfaces/libpq/exports.txt",