diff options
| author | Peter Eisentraut | 2020-02-10 16:12:46 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2020-02-10 18:23:41 +0000 |
| commit | b691c189c671ca9b88743ed6546b60641e5199e4 (patch) | |
| tree | 9ccc6bcf457b207ccc447ec9ce77dd9ee200606e /src/tools | |
| parent | 11de6c903da99a4b2220acfa776fc26c7f384ccc (diff) | |
Simplify passing of configure arguments to pg_config
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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/Solution.pm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 90352c1a7fe..8412ef298ea 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -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", |