Skip to content

Commit e6eeee0

Browse files
committed
[ClassicFlang] Adapt header include paths
Some header files have been moved to new directories in LLVM 17. StringExtras.h is no longer included transitively since D155178, and now needs to be included explicitly by clang/Frontend/Utils.h.
1 parent ccd4d14 commit e6eeee0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

clang/include/clang/Frontend/Utils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "clang/Basic/TargetInfo.h"
2121
#include "llvm/ADT/ArrayRef.h"
2222
#include "llvm/ADT/IntrusiveRefCntPtr.h"
23+
#include "llvm/ADT/StringExtras.h"
2324
#include "llvm/ADT/StringMap.h"
2425
#include "llvm/ADT/StringRef.h"
2526
#include "llvm/ADT/StringSet.h"

clang/lib/Driver/ToolChains/ClassicFlang.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "llvm/Support/FileSystem.h"
3232
#include "llvm/Support/Path.h"
3333
#include "llvm/Support/Process.h"
34-
#include "llvm/Support/TargetParser.h"
3534
#include "llvm/Support/YAMLParser.h"
35+
#include "llvm/TargetParser/TargetParser.h"
3636

3737
#ifdef LLVM_ON_UNIX
3838
#include <unistd.h> // For getuid().

clang/lib/Driver/ToolChains/ClassicFlang.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_ClassicFlang_H
1212

1313
#include "MSVC.h"
14-
#include "clang/Basic/DebugInfoOptions.h"
1514
#include "clang/Driver/Driver.h"
1615
#include "clang/Driver/Tool.h"
1716
#include "clang/Driver/Types.h"
18-
#include "llvm/ADT/Triple.h"
17+
#include "llvm/Frontend/Debug/Options.h"
1918
#include "llvm/Option/Option.h"
2019
#include "llvm/Support/raw_ostream.h"
20+
#include "llvm/TargetParser/Triple.h"
2121

2222
namespace clang {
2323
namespace driver {

0 commit comments

Comments
 (0)