[vcpkg-make] Switch to using VCPKG_HOST_IS_BSD

cqundefine · cqundefine · commit d5e8c10adf23 · 2025-09-14T15:52:39.000+02:00
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-make",
-  "version-date": "2025-08-21",
+  "version-date": "2025-09-14",
   "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
@@ -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)
diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake
@@ -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)
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -10013,7 +10013,7 @@
       "port-version": 0
     },
     "vcpkg-make": {
-      "baseline": "2025-08-21",
+      "baseline": "2025-09-14",
       "port-version": 0
     },
     "vcpkg-msbuild": {
diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "51f1826c79148de6ead03a12a8d747587cb642a2",
+      "version-date": "2025-09-14",
+      "port-version": 0
+    },
     {
       "git-tree": "25cbb472c3760bcb8ab3d34271f1c1c674ebcac7",
       "version-date": "2025-08-21",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vcpkg-make",`
`3`		`- "version-date": "2025-08-21",`
	`3`	`+ "version-date": "2025-09-14",`
`4`	`4`	`"documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",`
`5`	`5`	`"license": null,`
`6`	`6`	`"supports": "native",`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ function(vcpkg_make_configure)`
`133`	`133`	`EMMAKEN_JUST_CONFIGURE`
`134`	`134`	`)`
`135`	`135`
`136`		`- if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)`
	`136`	`+ if(VCPKG_HOST_IS_BSD)`
`137`	`137`	`find_program(Z_VCPKG_MAKE gmake REQUIRED)`
`138`	`138`	`else()`
`139`	`139`	`find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "51f1826c79148de6ead03a12a8d747587cb642a2",`
	`5`	`+ "version-date": "2025-09-14",`
	`6`	`+ "port-version": 0`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "25cbb472c3760bcb8ab3d34271f1c1c674ebcac7",`
`5`	`10`	`"version-date": "2025-08-21",`