From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Apr 2025 20:54:18 +0000 (-0700)
Subject: Merge branch 'ps/misc-build-fixes'
X-Git-Tag: v2.50.0-rc0~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cfdb0abc60372fb28c25566623334fe86c365d1;p=thirdparty%2Fgit.git

Merge branch 'ps/misc-build-fixes'

Random build fixes.

* ps/misc-build-fixes:
  ci: use Visual Studio for win+meson job on GitHub Workflows
  meson: distinguish build and target host binaries
  meson: respect 'tests' build option in contrib
  gitweb: fix generation of "gitweb.js"
  meson: fix handling of '-Dcurl=auto'
---

7cfdb0abc60372fb28c25566623334fe86c365d1
diff --cc Documentation/meson.build
index 8b9e692c59,32f0c5de12..8d9cd98548
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@@ -205,19 -205,11 +205,19 @@@ manpages = 
    'gitworkflows.adoc' : 7,
  }
  
 +manpages_breaking_changes = {
 +  'git-pack-redundant.adoc' : 1,
 +}
 +
 +if not get_option('breaking_changes')
 +  manpages += manpages_breaking_changes
 +endif
 +
  docs_backend = get_option('docs_backend')
  if docs_backend == 'auto'
-   if find_program('asciidoc', dirs: program_path, required: false).found()
+   if find_program('asciidoc', dirs: program_path, native: true, required: false).found()
      docs_backend = 'asciidoc'
-   elif find_program('asciidoctor', dirs: program_path, required: false).found()
+   elif find_program('asciidoctor', dirs: program_path, native: true, required: false).found()
      docs_backend = 'asciidoctor'
    else
      error('Neither asciidoc nor asciidoctor were found.')