From 875a1bf2e132e9083f3cf23b0fc59aeedaf61574 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Sun, 5 May 2024 19:20:33 +0200 Subject: makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …by a simple/static $(gb_UnpackedTarball_workdir)/foo see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163 Reviewed-by: Christian Lohmaier Tested-by: Jenkins --- external/argon2/ExternalProject_argon2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'external/argon2') diff --git a/external/argon2/ExternalProject_argon2.mk b/external/argon2/ExternalProject_argon2.mk index 7e521096af22..80d6b0596852 100644 --- a/external/argon2/ExternalProject_argon2.mk +++ b/external/argon2/ExternalProject_argon2.mk @@ -22,12 +22,12 @@ $(call gb_ExternalProject_get_state_target,argon2,build): $(call gb_Trace_StartRange,argon2,EXTERNAL) $(call gb_ExternalProject_run,build,\ MSBuild.exe vs2015/Argon2OptDll/Argon2OptDll.vcxproj \ - /p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \ + /p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \ $(gb_MSBUILD_CONFIG_AND_PLATFORM) \ /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ && MSBuild.exe vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj \ - /p:SolutionDir="$(call gb_UnpackedTarball_get_dir,argon2)/" \ + /p:SolutionDir="$(gb_UnpackedTarball_workdir)/argon2/" \ $(gb_MSBUILD_CONFIG_AND_PLATFORM) \ /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ -- cgit