From febcdddf966987bd0d14642b90dbbdb08a7f2bf6 Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Sun, 7 Nov 2021 23:32:18 -0500
Subject: [PATCH 1/3] `Keg::Relocation`: allow `-I`, `-L`, `-isystem` prefixes

---
 Library/Homebrew/keg_relocate.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb
index a19eca11a2..772acd21b6 100644
--- a/Library/Homebrew/keg_relocate.rb
+++ b/Library/Homebrew/keg_relocate.rb
@@ -12,7 +12,7 @@ class Keg
   class Relocation
     extend T::Sig
 
-    RELOCATABLE_PATH_REGEX_PREFIX = /(?<![a-zA-Z0-9])/.freeze
+    RELOCATABLE_PATH_REGEX_PREFIX = /(?:(?<=-I|-L|-isystem)|(?<![a-zA-Z0-9]))/.freeze
 
     def initialize
       @replacement_map = {}

From c07bf0d38f067ac637d3a570b4f9465c69489b3b Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Mon, 8 Nov 2021 00:44:57 -0500
Subject: [PATCH 2/3] Add `-F` to allowed prefixes

Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
---
 Library/Homebrew/keg_relocate.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb
index 772acd21b6..eaa3f3582b 100644
--- a/Library/Homebrew/keg_relocate.rb
+++ b/Library/Homebrew/keg_relocate.rb
@@ -12,7 +12,7 @@ class Keg
   class Relocation
     extend T::Sig
 
-    RELOCATABLE_PATH_REGEX_PREFIX = /(?:(?<=-I|-L|-isystem)|(?<![a-zA-Z0-9]))/.freeze
+    RELOCATABLE_PATH_REGEX_PREFIX = /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))/.freeze
 
     def initialize
       @replacement_map = {}

From ee898b13092a38495e31078a478b2fbae20357a8 Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Mon, 8 Nov 2021 20:18:25 -0500
Subject: [PATCH 3/3] Fix tests

---
 Library/Homebrew/test/keg_relocate/relocation_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/test/keg_relocate/relocation_spec.rb b/Library/Homebrew/test/keg_relocate/relocation_spec.rb
index c4e0e43a69..36cdbdc18a 100644
--- a/Library/Homebrew/test/keg_relocate/relocation_spec.rb
+++ b/Library/Homebrew/test/keg_relocate/relocation_spec.rb
@@ -12,8 +12,8 @@ describe Keg::Relocation do
   let(:cellar_placeholder) { "@@HOMEBREW_CELLAR@@" }
   let(:repository_placeholder) { "@@HOMEBREW_REPOSITORY@@" }
   let(:library_placeholder) { "@@HOMEBREW_LIBRARY@@" }
-  let(:escaped_prefix) { /(?<![a-zA-Z0-9])#{Regexp.escape(HOMEBREW_PREFIX)}/o }
-  let(:escaped_cellar) { /(?<![a-zA-Z0-9])#{HOMEBREW_CELLAR}/o }
+  let(:escaped_prefix) { /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))#{Regexp.escape(HOMEBREW_PREFIX)}/o }
+  let(:escaped_cellar) { /(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))#{HOMEBREW_CELLAR}/o }
 
   def setup_relocation
     relocation = described_class.new
@@ -61,8 +61,8 @@ describe Keg::Relocation do
 
   specify "::path_to_regex" do
     expect(described_class.path_to_regex(prefix)).to eq escaped_prefix
-    expect(described_class.path_to_regex("foo.bar")).to eq(/(?<![a-zA-Z0-9])foo\.bar/)
+    expect(described_class.path_to_regex("foo.bar")).to eq(/(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))foo\.bar/)
     expect(described_class.path_to_regex(/#{cellar}/o)).to eq escaped_cellar
-    expect(described_class.path_to_regex(/foo.bar/)).to eq(/(?<![a-zA-Z0-9])foo.bar/)
+    expect(described_class.path_to_regex(/foo.bar/)).to eq(/(?:(?<=-F|-I|-L|-isystem)|(?<![a-zA-Z0-9]))foo.bar/)
   end
 end