diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-07-05 18:54:38 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-07-05 18:54:38 +0000 |
| commit | 291a9577454a63f99b5537e48a3dceae6d35ea8d (patch) | |
| tree | a842e9bd4b21b681b89516a33fe65b207a21c42d /src/template | |
| parent | eb81b6509f4c9109ecf8839d8c482cc597270687 (diff) | |
| download | postgresql-291a9577454a63f99b5537e48a3dceae6d35ea8d.tar.gz | |
Split the LDFLAGS make variable into two parts: LDFLAGS is now used for
linking both executables and shared libraries, and we add on LDFLAGS_EX when
linking executables or LDFLAGS_SL when linking shared libraries. This
provides a significantly cleaner way of dealing with link-time switches than
the former behavior. Also, make sure that the various platform-specific
%.so: %.o rules incorporate LDFLAGS and LDFLAGS_SL; most of them missed that
before. (I did not add these variables for the platforms that invoke $(LD)
directly, however. It's not clear if we can do that safely, since for the
most part we assume these variables use CC command-line syntax.)
Per gripe from Aaron Swenson and subsequent investigation.
Diffstat (limited to 'src/template')
| -rw-r--r-- | src/template/cygwin | 9 | ||||
| -rw-r--r-- | src/template/win32 | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/template/cygwin b/src/template/cygwin index 276fa8081d..b2fe3640c6 100644 --- a/src/template/cygwin +++ b/src/template/cygwin @@ -1,9 +1,8 @@ -# $PostgreSQL: pgsql/src/template/cygwin,v 1.7 2006/03/11 04:38:40 momjian Exp $ +# $PostgreSQL: pgsql/src/template/cygwin,v 1.8 2010/07/05 18:54:38 tgl Exp $ SRCH_LIB="/usr/local/lib" -# This is required to link pg_dump because it finds pg_toupper() in -# libpq and pgport -LDFLAGS="-Wl,--allow-multiple-definition -Wl,--enable-auto-import" +# --allow-multiple-definition is required to link pg_dump because it finds +# pg_toupper() in both libpq and pgport # --enable-auto-import gets rid of a diagnostics linker message -LDFLAGS_SL="-Wl,--enable-auto-import" +LDFLAGS="-Wl,--allow-multiple-definition -Wl,--enable-auto-import" diff --git a/src/template/win32 b/src/template/win32 index e9ab1fe7a5..71f5fa1c1b 100644 --- a/src/template/win32 +++ b/src/template/win32 @@ -1,4 +1,3 @@ -# This is required to link pg_dump because it finds pg_toupper() in -# libpq and pgport +# --allow-multiple-definition is required to link pg_dump because it finds +# pg_toupper() in both libpq and pgport LDFLAGS="-Wl,--allow-multiple-definition" - |