From c4c91c5c82b9fcb0b4d1c08b70cfb65fbb000568 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Tue, 26 Mar 2024 10:43:46 -0400 Subject: [PATCH] workflow/build-git-installer: use OS supplied libcurl Stop building custom universal libcurl dylib and let Git binaries use the version installed on the OS, like we do for other libraries. Signed-off-by: Jeff Hostetler --- .github/workflows/build-git-installers.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index fbcd49d7477636..cfcb220f4d4766 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -325,15 +325,14 @@ jobs: # Install x86_64 packages arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - arch -x86_64 /usr/local/bin/brew install gettext curl + arch -x86_64 /usr/local/bin/brew install gettext # Install arm64 packages brew install automake asciidoc xmlto docbook brew link --force gettext - # Make universal gettext and curl library + # Make universal gettext library lipo -create -output libintl.a /usr/local/opt/gettext/lib/libintl.a /opt/homebrew/opt/gettext/lib/libintl.a - lipo -create -output libcurl.dylib /opt/homebrew/opt/curl/lib/libcurl.4.dylib /usr/local/opt/curl/lib/libcurl.4.dylib - name: Set up signing/notarization infrastructure env: @@ -412,9 +411,9 @@ jobs: LDFLAGS = -L"$(pwd)" EOF - # Configure the Git build to pick up the universal `libcurl.dylib` + # Configure the Git to use the OS supplied libcurl. cat >>git/config.mak <