diff options
| author | Noah Misch | 2014-10-22 02:55:43 +0000 |
|---|---|---|
| committer | Noah Misch | 2014-10-22 02:55:43 +0000 |
| commit | 53566fc0940cf557416b13252df57350a4511ce4 (patch) | |
| tree | 892c3d89ffc78b99eb45ff78ad4f03d49569eb48 /src/interfaces/ecpg | |
| parent | 31dd7fcd03609dbc3c3be85e645ccc7c715db719 (diff) | |
MinGW: Link with shell32.dll instead of shfolder.dll.
This improves consistency with the MSVC build. On buildfarm member
narwhal, since commit 846e91e0223cf9f2821c3ad4dfffffbb929cb027,
shfolder.dll:SHGetFolderPath() crashes when dblink calls it by way of
pqGetHomeDirectory(). Back-patch to 9.4, where that commit first
appeared. How it caused this regression remains a mystery. This is a
partial revert of commit 889f03812916b146ae504c0fad5afdc7bf2e8a2a, which
adopted shfolder.dll for Windows NT 4.0 compatibility. PostgreSQL 8.2
dropped support for that operating system.
Diffstat (limited to 'src/interfaces/ecpg')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index c99faac42e..43b76f697b 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -39,11 +39,6 @@ SHLIB_PREREQS = submake-libpq submake-pgtypeslib SHLIB_EXPORTS = exports.txt -ifeq ($(PORTNAME), win32) -# Link to shfolder.dll instead of shell32.dll -SHLIB_LINK += -lshfolder -endif - PKG_CONFIG_REQUIRES_PRIVATE = libpq libpgtypes all: all-lib |