diff options
| author | Peter Eisentraut | 2022-03-25 07:44:31 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2022-03-25 07:56:02 +0000 |
| commit | 23119d51a14c046dae35ae5e6ad9e35982d044fd (patch) | |
| tree | 890a141660b21c60d9f6e2fc8efd7944a55673a9 /src/template | |
| parent | 56566835039ac5eed70f188518cef1a7ea0971b2 (diff) | |
Refactor DLSUFFIX handling
Move DLSUFFIX from makefiles into header files for all platforms.
Move the DLSUFFIX assignment from src/makefiles/ to src/templates/,
have configure read it, and then substitute it into Makefile.global
and pg_config.h. This avoids the need for all makefile rules that
need it to locally set CPPFLAGS. It also resolves an inconsistent
setup between the two Windows build systems.
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/2f9861fb-8969-9005-7518-b8e60f2bead9@enterprisedb.com
Diffstat (limited to 'src/template')
| -rw-r--r-- | src/template/cygwin | 2 | ||||
| -rw-r--r-- | src/template/hpux | 7 | ||||
| -rw-r--r-- | src/template/win32 | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/template/cygwin b/src/template/cygwin index 1e7274bc33a..3f42e2f8b69 100644 --- a/src/template/cygwin +++ b/src/template/cygwin @@ -13,3 +13,5 @@ CFLAGS_SL="" # we'd prefer to use --disable-auto-import to match MSVC linking behavior, # but support for it in Cygwin is too haphazard LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--enable-auto-import" + +DLSUFFIX=".dll" diff --git a/src/template/hpux b/src/template/hpux index 50fff80c530..5105a74c78f 100644 --- a/src/template/hpux +++ b/src/template/hpux @@ -25,3 +25,10 @@ case $host in fi ;; esac + +case $host_cpu in + ia64) + DLSUFFIX=".so";; + *) + DLSUFFIX=".sl";; +esac diff --git a/src/template/win32 b/src/template/win32 index 1380d16548c..1895f067a88 100644 --- a/src/template/win32 +++ b/src/template/win32 @@ -7,3 +7,5 @@ CFLAGS_SL="" # pg_toupper() etc. in both libpq and pgport # --disable-auto-import is to ensure we get MSVC-like linking behavior LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition -Wl,--disable-auto-import" + +DLSUFFIX=".dll" |