diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-05 19:20:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-06 11:40:45 +0200 |
| commit | 875a1bf2e132e9083f3cf23b0fc59aeedaf61574 (patch) | |
| tree | e0aaa2967914dc9d1ece2055d4dfe3805982b41e /external/argon2 | |
| parent | 971db10d73a0fe80cceca70d19edd02de30be414 (diff) | |
makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
…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 <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'external/argon2')
| -rw-r--r-- | external/argon2/ExternalProject_argon2.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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)) \ |