Skip to content

Commit bae3254

Browse files
committed
Fix buildbot failure due to triple normalization issues
We have been seeing buildbot failures due to #122629 I posted #135571 to update the triple normalization logic, but that patch hasn't gotten any traction. So in this patch I am updating the lit config to use triple from clang's output for `%itanium_abi_triple` substitution, instead of relying on `self.config.target_triple` which might not be in a canonical form. Buildbot failure example: https://lab.llvm.org/buildbot/#/builders/40 Change-Id: Ib9c3425fddac45d7468fad20929fd29358a55e1b
1 parent ad5b3e0 commit bae3254

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

llvm/utils/lit/lit/llvm/config.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,11 @@ def use_clang(
674674
(
675675
"%itanium_abi_triple",
676676
self.normalize_triple(
677-
self.make_itanium_abi_triple(self.config.target_triple)
677+
self.make_itanium_abi_triple(
678+
self.get_process_output(
679+
[self.config.clang, "--print-target-triple"]
680+
)[0].split("\n")[0]
681+
)
678682
),
679683
)
680684
)

0 commit comments

Comments
 (0)