Skip to content

Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD #47309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 2 commits into from
Sep 30, 2025
Merged

Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD #47309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6e3afb
Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD
cqundefine Sep 12, 2025
51c1d25
[vcpkg-make] Switch to using VCPKG_HOST_IS_BSD
cqundefine Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/vcpkg-make/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vcpkg-make",
"version-date": "2025-09-19",
"version-date": "2025-09-29",
"documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
"license": null,
"supports": "native",
Expand Down
2 changes: 1 addition & 1 deletion ports/vcpkg-make/vcpkg_make_configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function(vcpkg_make_configure)
EMMAKEN_JUST_CONFIGURE
)

if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
if(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
else()
find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion ports/vcpkg-make/vcpkg_make_install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function(vcpkg_make_install)
vcpkg_make_get_shell(shell_var)
set(shell_cmd "${shell_var}")

if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
if(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
else()
find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED)
Expand Down
4 changes: 4 additions & 0 deletions scripts/cmake/vcpkg_common_definitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
set(VCPKG_TARGET_IS_ANDROID ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(VCPKG_TARGET_IS_FREEBSD ON)
set(VCPKG_TARGET_IS_BSD ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
set(VCPKG_TARGET_IS_OPENBSD ON)
set(VCPKG_TARGET_IS_BSD ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "SunOS")
set(VCPKG_TARGET_IS_SOLARIS ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
Expand All @@ -41,8 +43,10 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(VCPKG_HOST_IS_LINUX ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
set(VCPKG_HOST_IS_FREEBSD ON)
set(VCPKG_HOST_IS_BSD ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD")
set(VCPKG_HOST_IS_OPENBSD ON)
set(VCPKG_HOST_IS_BSD ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "SunOS")
set(VCPKG_HOST_IS_SOLARIS ON)
endif()
Expand Down
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_configure_make.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ function(vcpkg_configure_make)
# Export matching make program for vcpkg_build_make (cache variable)
if(CMAKE_HOST_WIN32 AND MSYS_ROOT)
find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
elseif(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
elseif(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
elseif(VCPKG_HOST_IS_SOLARIS)
find_program(Z_VCPKG_MAKE NAMES gmake make REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion scripts/ports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ target system or to the host system. Use a prefixed variable instead.

if(DEFINED PORT)
# Always fixup RPATH on linux, osx and bsds unless explicitly disabled.
if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH))
if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_BSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH))
z_vcpkg_fixup_rpath_in_dir()
endif()
if(VCPKG_FIXUP_MACHO_RPATH OR (VCPKG_TARGET_IS_OSX AND NOT DEFINED VCPKG_FIXUP_MACHO_RPATH))
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10061,7 +10061,7 @@
"port-version": 0
},
"vcpkg-make": {
"baseline": "2025-09-19",
"baseline": "2025-09-29",
"port-version": 0
},
"vcpkg-msbuild": {
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "73a90e27dfaf176bb25ec339e8b3077054de52da",
"version-date": "2025-09-29",
"port-version": 0
},
{
"git-tree": "11501b3c7cff0f97a1c3e0200ff1b3c6d043e643",
"version-date": "2025-09-19",
Expand Down
Loading