Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[vcpkg-make] Fix the make binary path on BSDs (#47009)

This commit is contained in:
CQ_Undefine 2025-08-30 11:18:14 +02:00 committed by GitHub
parent 5a01de756c
commit b1b19307e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-make/vcpkg.json
View File

@ -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",

6
ports/vcpkg-make/vcpkg_make_configure.cmake
View File

@ -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()

6
ports/vcpkg-make/vcpkg_make_install.cmake
View File

@ -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}")

2
versions/baseline.json
View File

@ -10005,7 +10005,7 @@
"port-version": 0
},
"vcpkg-make": {
"baseline": "2025-07-09",
"baseline": "2025-08-21",
"port-version": 0
},
"vcpkg-msbuild": {

5
versions/v-/vcpkg-make.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "25cbb472c3760bcb8ab3d34271f1c1c674ebcac7",
"version-date": "2025-08-21",
"port-version": 0
},
{
"git-tree": "a61503261b3d9410e844b52cab080cdf91b17685",
"version-date": "2025-07-09",