Skip to content

Commit

Permalink
workflow/build-git-installer: use OS supplied libcurl
Browse files Browse the repository at this point in the history
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 <jeffhostetler@github.com>
  • Loading branch information
jeffhostetler committed Mar 26, 2024
1 parent 94a7088 commit 1e44a0f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/build-git-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 <<EOF
CURL_LDFLAGS := -L"$(pwd)" -lcurl
CURL_LDFLAGS := -lcurl
CURL_CONFIG := /usr/bin/true
EOF
Expand Down

0 comments on commit 1e44a0f

Please sign in to comment.