diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json index 19588a62de..ff6b2de4ee 100644 --- a/ports/vcpkg-make/vcpkg.json +++ b/ports/vcpkg-make/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-make", - "version-date": "2025-07-09", + "version-date": "2025-08-21", "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", "license": null, "supports": "native", diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake index 6175473a5f..0f984df876 100644 --- a/ports/vcpkg-make/vcpkg_make_configure.cmake +++ b/ports/vcpkg-make/vcpkg_make_configure.cmake @@ -133,5 +133,9 @@ function(vcpkg_make_configure) EMMAKEN_JUST_CONFIGURE ) - find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) + if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) + endif() endfunction() diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake index 275ae912e4..71530efdbd 100644 --- a/ports/vcpkg-make/vcpkg_make_install.cmake +++ b/ports/vcpkg-make/vcpkg_make_install.cmake @@ -41,7 +41,11 @@ function(vcpkg_make_install) vcpkg_make_get_shell(shell_var) set(shell_cmd "${shell_var}") - find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) + if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED) + endif() set(make_command "${Z_VCPKG_MAKE}") set(destdir "${CURRENT_PACKAGES_DIR}") diff --git a/versions/baseline.json b/versions/baseline.json index ee88228fcd..eb80957740 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10005,7 +10005,7 @@ "port-version": 0 }, "vcpkg-make": { - "baseline": "2025-07-09", + "baseline": "2025-08-21", "port-version": 0 }, "vcpkg-msbuild": { diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json index 3a8702612c..12827a73cb 100644 --- a/versions/v-/vcpkg-make.json +++ b/versions/v-/vcpkg-make.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25cbb472c3760bcb8ab3d34271f1c1c674ebcac7", + "version-date": "2025-08-21", + "port-version": 0 + }, { "git-tree": "a61503261b3d9410e844b52cab080cdf91b17685", "version-date": "2025-07-09",