Rollup merge of #107764 - maurer:llvm-16, r=cuviper
llvm-16: Use Triple.h from new header location.
LLVM 16 has moved Triple.h from ADT and into TargetParser.
LLVM [landed a commit](62c7f035b4
) this morning moving the header. This change should make rustc continue to build against LLVM main.
This commit is contained in:
commit
232213dd77
@ -4,7 +4,6 @@
|
||||
#include "llvm/ADT/ArrayRef.h"
|
||||
#include "llvm/ADT/DenseSet.h"
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
#include "llvm/ADT/Triple.h"
|
||||
#include "llvm/Analysis/Lint.h"
|
||||
#include "llvm/Analysis/Passes.h"
|
||||
#include "llvm/IR/IRBuilder.h"
|
||||
@ -44,6 +43,12 @@
|
||||
#include "llvm/IR/IRPrintingPasses.h"
|
||||
#include "llvm/Linker/Linker.h"
|
||||
|
||||
#if LLVM_VERSION_GE(16, 0)
|
||||
#include "llvm/TargetParser/Triple.h"
|
||||
#else
|
||||
#include "llvm/ADT/Triple.h"
|
||||
#endif
|
||||
|
||||
extern "C" void LLVMRustSetLastError(const char *);
|
||||
|
||||
enum class LLVMRustResult { Success, Failure };
|
||||
|
Loading…
x
Reference in New Issue
Block a user