Bug 1899227 - Work around clang trunk no linking the i686-linux target with our i686 sysroot. r=firefox-build-system-reviewers,ahochheiden

Unblock the clang trunk builds until we find the right fix on our end.

Differential Revision: https://phabricator.services.mozilla.com/D211814
This commit is contained in:
Mike Hommey 2024-05-28 21:07:29 +00:00
parent 7139be1a4e
commit ac71287d49
2 changed files with 15 additions and 0 deletions

View File

@ -10,6 +10,7 @@
"revert-llvmorg-15-init-13446-g7524fe962e47.patch",
"win64-ret-null-on-commitment-limit_clang_14.patch",
"arm64e-hack.patch",
"i586-linux.patch",
"compiler-rt-rss-limit-heap-profile.patch"
]
}

View File

@ -0,0 +1,14 @@
Temporary workaround for https://github.com/llvm/llvm-project/issues/93502
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index c0100fed1513..2694c3cb6ebf 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2496,6 +2496,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
static const char *const X32LibDirs[] = {"/libx32", "/lib"};
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
static const char *const X86Triples[] = {
+ "i586-linux-gnu",
"i686-linux-gnu", "i686-pc-linux-gnu", "i386-redhat-linux6E",
"i686-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
"i686-montavista-linux",