From 9bdce787dae8d1634af3bf084a44f29880c1bff8 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Fri, 21 Oct 2022 18:24:50 -0700 Subject: [PATCH] awscli: replace ld workaround with lightweight alternative Closes #113743. Signed-off-by: Branch Vincent <19800529+branchvincent@users.noreply.github.com> Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> --- Formula/awscli.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Formula/awscli.rb b/Formula/awscli.rb index bec8d8c1477..70db1fa45c0 100644 --- a/Formula/awscli.rb +++ b/Formula/awscli.rb @@ -23,10 +23,6 @@ class Awscli < Formula depends_on "python@3.10" depends_on "six" - on_macos do - depends_on "llvm" => :build if DevelopmentTools.clang_build_version >= 1400 - end - on_system :linux, macos: :ventura_or_newer do depends_on "groff" end @@ -112,7 +108,8 @@ class Awscli < Formula def install # Temporary workaround for Xcode 14's ld causing build failure (without logging a reason): # ld: fatal warning(s) induced error (-fatal_warnings) - ENV.append "LDFLAGS", "-fuse-ld=lld" if OS.mac? && (DevelopmentTools.clang_build_version >= 1400) + # Ref: https://github.com/python/cpython/issues/97524 + ENV.append "LDFLAGS", "-Wl,-no_fixup_chains" if DevelopmentTools.clang_build_version >= 1400 # The `awscrt` package uses its own libcrypto.a on Linux. When building _awscrt.*.so, # Homebrew's default environment causes issues, which may be due to `openssl` flags. @@ -125,7 +122,7 @@ class Awscli < Formula ENV.prepend "LDFLAGS", "-L./build/temp.linux-x86_64-#{python_version}/deps/install/lib" end - # setuptools>=60 prefers its own bundled distutils, which is incompatabile with docutils~=0.15 + # setuptools>=60 prefers its own bundled distutils, which is incompatible with docutils~=0.15 # Force the previous behavior of using distutils from the stdlib # Remove when fixed upstream: https://github.com/aws/aws-cli/pull/6011 with_env(SETUPTOOLS_USE_DISTUTILS: "stdlib") do