From eb3d2ed68b655b61846f03721c90eb772584dd6a Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 31 Jan 2020 08:22:02 +0200 Subject: Provisioning: Remove unistd.h from postreSQL from 64 bit Windows PostreSQL 9.6 version creates emtpy unistd.h file which will cause failure in Qt Safe Renderer' MinGW build. By removing it the system should use the one from the MinGW environment. Task-number: COIN-488 Change-Id: I76d3f34dd9726dc4f0aac06c410f306dffc8f365 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/postgresql.ps1 | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1 index 7fcaeb02..27f9190a 100644 --- a/coin/provisioning/common/windows/postgresql.ps1 +++ b/coin/provisioning/common/windows/postgresql.ps1 @@ -58,6 +58,7 @@ if (Is64BitWinHost) { Remove-Item -Path $packagex64 # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555) Remove-item -Path "$installFolder\pgsql\include\pthread.h" + Remove-item -Path "$installFolder\pgsql\include\unistd.h" Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include" Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib" -- cgit v1.2.3