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

First step away from SVN versioning.

Browse Source
This commit is contained in:
Axel Naumann 2014-03-04 19:26:11 +01:00 committed by sftnight
parent 57a84ab394
commit 297d6a0019
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cling/Interpreter/Interpreter.h
View File

@ -265,7 +265,7 @@ namespace cling {
bool withAccessControl);
///\brief Set up include paths for runtime headers.
void AddRuntimeIncludePaths();
void AddRuntimeIncludePaths(const char* argv0);
///\brief Include C++ runtime headers and definitions.
void IncludeCxxRuntime();
///\brief Include C runtime headers and definitions.

12
lib/Interpreter/Interpreter.cpp
View File

@ -186,7 +186,7 @@ namespace cling {
handleFrontendOptions();
AddRuntimeIncludePaths();
AddRuntimeIncludePaths(argv[0]);
// Tell the diagnostic client that we are entering file parsing mode.
DiagnosticConsumer& DClient = getCI()->getDiagnosticClient();
@ -212,7 +212,11 @@ namespace cling {
}
const char* Interpreter::getVersion() const {
return "$Id$";
#ifdef CLING_VERSION
return CLING_VERSION
#else
return "<unknown>";
#endif
}
void Interpreter::handleFrontendOptions() {
@ -224,7 +228,7 @@ namespace cling {
}
}
void Interpreter::AddRuntimeIncludePaths() {
void Interpreter::AddRuntimeIncludePaths(const char* argv0) {
// Add configuration paths to interpreter's include files.
#ifdef CLING_INCLUDE_PATHS
llvm::StringRef InclPaths(CLING_INCLUDE_PATHS);
@ -238,7 +242,7 @@ namespace cling {
// Add remaining part
AddIncludePath(InclPaths);
#endif
llvm::SmallString<512> P(GetExecutablePath(argv[0]));
llvm::SmallString<512> P(GetExecutablePath(argv0));
if (!P.empty()) {
// Remove /cling from foo/bin/clang
llvm::StringRef ExeIncl = llvm::sys::path::parent_path(P);