From 8b88ca68e20e302a8aa073ada24656754922e609 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 17 Oct 2009 09:04:56 +0000 Subject: [PATCH] Simplify (move guard to caller instead of callee). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84325 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/clang-cc/clang-cc.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp index 0ad7efbc48..833386dd17 100644 --- a/tools/clang-cc/clang-cc.cpp +++ b/tools/clang-cc/clang-cc.cpp @@ -1139,9 +1139,6 @@ isysroot("isysroot", llvm::cl::value_desc("dir"), llvm::cl::init("/"), // Add the clang headers, which are relative to the clang binary. void AddClangIncludePaths(const char *Argv0, InitHeaderSearch *Init) { - if (nostdclanginc) - return; - llvm::sys::Path MainExecutablePath = llvm::sys::Path::GetMainExecutable(Argv0, (void*)(intptr_t)AddClangIncludePaths); @@ -1243,7 +1240,8 @@ void InitializeIncludePaths(const char *Argv0, HeaderSearch &Headers, Init.AddDefaultEnvVarPaths(Lang); - AddClangIncludePaths(Argv0, &Init); + if (!nostdclanginc) + AddClangIncludePaths(Argv0, &Init); if (!nostdinc) Init.AddDefaultSystemIncludePaths(Lang, triple); -- 2.50.1