diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-02-03 18:59:41 +0100 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-02-03 23:16:35 +0100 |
commit | bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a (patch) | |
tree | a5c7dac389b6332e75f41c94e330ed5afe6b508d /external | |
parent | edb9b269c41619ebf15cad4b893953c57cc470c0 (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>
Diffstat (limited to 'external')
-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) |