From 8e779c062a22a5755cae2c86787e16f59bfe4907 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Fri, 8 Oct 2021 10:51:50 +0200 Subject: Centralize VS-to-toolset mapping in configure This allows to define the mapping once, and avoid modification in multiple places each time a new VS version support is added Change-Id: I93de4c9d78c3f67a0a2e157007e9d13b6f557937 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123163 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- external/python3/ExternalProject_python3.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'external/python3') diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 46fbdad5ab14..3d287a7fde73 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -42,8 +42,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : /p:libffiOutDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/.libs \ /p:libffiIncludeDir=$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)/include \ /maxcpucount \ - $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ - $(if $(filter 170,$(VCVER)),/p:PlatformToolset=v143 /p:VisualStudioVersion=17.0 /ToolsVersion:Current) \ + /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ ,PCBuild) $(call gb_Trace_EndRange,python3,EXTERNAL) -- cgit