diff options
author | Eric Astor <epastor@google.com> | 2021-06-09 15:49:51 -0400 |
---|---|---|
committer | Eric Astor <epastor@google.com> | 2021-06-09 15:49:51 -0400 |
commit | 68d0db0b6d56ec900044539b30c458d896ea55ba (patch) | |
tree | e8b4be5dadf8d64427fa7ef5d325df653e2c5cc9 /llvm/tools/llvm-ml/llvm-ml.cpp | |
parent | c43f413b01b021a8f7b6fce013296114fa92a245 (diff) | |
download | llvm-68d0db0b6d56ec900044539b30c458d896ea55ba.zip llvm-68d0db0b6d56ec900044539b30c458d896ea55ba.tar.gz llvm-68d0db0b6d56ec900044539b30c458d896ea55ba.tar.bz2 |
Revert "[ms] [llvm-ml] Add support for INCLUDE environment variable"
This reverts commit c43f413b01b021a8f7b6fce013296114fa92a245 due to Windows environment build breaks
Diffstat (limited to 'llvm/tools/llvm-ml/llvm-ml.cpp')
-rw-r--r-- | llvm/tools/llvm-ml/llvm-ml.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/llvm/tools/llvm-ml/llvm-ml.cpp b/llvm/tools/llvm-ml/llvm-ml.cpp index 7fefb9d..14f75d0 100644 --- a/llvm/tools/llvm-ml/llvm-ml.cpp +++ b/llvm/tools/llvm-ml/llvm-ml.cpp @@ -36,7 +36,6 @@ #include "llvm/Support/InitLLVM.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" -#include "llvm/Support/Process.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" @@ -264,21 +263,8 @@ int main(int Argc, char **Argv) { SrcMgr.AddNewSourceBuffer(std::move(*BufferPtr), SMLoc()); // Record the location of the include directories so that the lexer can find - // included files later. - std::vector<std::string> IncludeDirs = - InputArgs.getAllArgValues(OPT_include_path); - if (!InputArgs.hasArg(OPT_ignore_include_envvar)) { - if (llvm::Optional<std::string> cl_include_dir = - llvm::sys::Process::GetEnv("INCLUDE")) { - SmallVector<StringRef, 8> Dirs; - StringRef(*cl_include_dir) - .split(Dirs, ";", /*MaxSplit=*/-1, /*KeepEmpty=*/false); - IncludeDirs.reserve(IncludeDirs.size() + Dirs.size()); - for (StringRef Dir : Dirs) - IncludeDirs.push_back(Dir.str()); - } - } - SrcMgr.setIncludeDirs(IncludeDirs); + // it later. + SrcMgr.setIncludeDirs(InputArgs.getAllArgValues(OPT_include_path)); std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TripleName)); assert(MRI && "Unable to create target register info!"); |