diff options
| author | Tom Lane | 2010-07-05 23:15:56 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-07-05 23:15:56 +0000 |
| commit | f9e9da666423f38d9c0f97277cf4e21973608baf (patch) | |
| tree | 31ca431a9ed6a347619c80f5364b6ee9df8ad779 /src/makefiles/Makefile.cygwin | |
| parent | 291a9577454a63f99b5537e48a3dceae6d35ea8d (diff) | |
Fix a few single-file (MODULES, not MODULE_big) contrib makefiles that were
supposing that they should set SHLIB_LINK rather than LDFLAGS_SL. Since these
don't go through Makefile.shlib that was a no-op on most platforms. Also
regularize the few platform-specific Makefiles that did pay attention to
SHLIB_LINK: it seems that the real value of that is to pull in BE_DLLLIBS,
so do that instead. Per buildfarm failures on cygwin.
Diffstat (limited to 'src/makefiles/Makefile.cygwin')
| -rw-r--r-- | src/makefiles/Makefile.cygwin | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 2c0f87cd53d..1a5bdc85cd8 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.14 2010/07/05 18:54:38 tgl Exp $ +# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.15 2010/07/05 23:15:56 tgl Exp $ DLLTOOL= dlltool DLLWRAP= dllwrap ifdef PGXS @@ -41,5 +41,5 @@ endif # Rule for building a shared library from a single .o file %.dll: %.o $(DLLTOOL) --export-all --output-def $*.def $< - $(DLLWRAP) -o $@ --def $*.def $< $(SHLIB_LINK) + $(DLLWRAP) -o $@ --def $*.def $< $(LDFLAGS) $(LDFLAGS_SL) $(BE_DLLLIBS) rm -f $*.def |
