diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-03 18:59:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-04 18:12:02 +0100 |
| commit | b7a5f5ed9fcfce61eccf116a6cccb2ceb9a75d75 (patch) | |
| tree | 9de14b5027eb4c35ff30d7baf97b17db26114bd5 | |
| parent | 12520fd5c5d5a7191fbe17ddd503764b0c7368fa (diff) | |
postgresql: try to cargo-cult MSBuild arguments
Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.
Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
(cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110361
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index cec1fb62b541..c0713161878f 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -25,7 +25,9 @@ $(eval $(call gb_ExternalProject_use_nmake,postgresql,build)) $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_Trace_StartRange,postgresql,EXTERNAL) $(call gb_ExternalProject_run,build,\ - MSBFLAGS=/p:Platform=$(gb_MSBUILD_PLATFORM) \ + MSBFLAGS="/p:Platform=$(gb_MSBUILD_PLATFORM) \ + $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \ $(PERL) build.pl $(gb_MSBUILD_CONFIG) libpq \ ,src/tools/msvc) $(call gb_Trace_EndRange,postgresql,EXTERNAL) |