gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check HostCXXI is empty rather than size() < 3.

Browse Source 
Signed-off-by: Vassil Vassilev <vvasilev@cern.ch>
This commit is contained in:
Frederich Munch 2016-08-14 22:54:11 -04:00 committed by sftnight
parent 9bbd82c365
commit 0f487d12af
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Interpreter/CIFactory.cpp
View File

@ -490,9 +490,11 @@ namespace {
return;
}
}
// Need HostCXXI.empty as a check condition later
assert(HostCXXI.empty() && "HostCXXI not empty");
static const char *CppInclQuery =
"LC_ALL=C " LLVM_CXX " -xc++ -E -v /dev/null 2>&1 >/dev/null"
"LC_ALL=C " LLVM_CXX " -xc++ -E -v /dev/null 2>&1 >/dev/null "
"| awk '/^#include </,/^End of search"
"/{if (!/^#include </ && !/^End of search/){ print }}' "
"| GREP_OPTIONS= grep -E \"(c|g)\\+\\+\"";
@ -513,8 +515,8 @@ namespace {
}
::pclose(pf);
}
// HostCXXI contains at least -nostdinc++, -I
if (HostCXXI.size() < 3) {
if (HostCXXI.empty()) {
llvm::errs() << "ERROR in cling::CIFactory::createCI(): cannot extract "
"standard library include paths!\n"
"Invoking:\n"