ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-22 04:18:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Release 15.2.0

Browse Source 
Backporting some changes in ICG that better supports clang/llvm installations in
Linux.

refs #228
This commit is contained in:
Alex Lin 2016-04-19 17:05:42 -05:00
parent 489737d34c
commit c10d2897f9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
trick_source/codegen/Interface_Code_Gen/HeaderSearchDirs.cpp
View File

@ -32,22 +32,23 @@ void HeaderSearchDirs::AddCompilerBuiltInSearchDirs () {
const bool IsFramework = false; const bool IsFramework = false;
const bool IsSysRootRelative = true; const bool IsSysRootRelative = true;
#ifdef __linux
// Add clang specific include directory first. Only required on linux systems. :( // Add clang specific include directory first. Only required on linux systems. :(
// This is so that ICG will find clang friendly headers first. gcc headers cause
// all kinds of problems. On macs all headers are clang friendly.
#if __linux
std::stringstream icg_dir ; std::stringstream icg_dir ;
icg_dir << std::string(getenv("TRICK_HOME")) << "/trick_source/codegen/Interface_Code_Gen/lib/clang/" ; icg_dir << LLVM_HOME << "/lib/clang/" ;
icg_dir << __clang_major__ << "." << __clang_minor__ ; icg_dir << __clang_major__ << "." << __clang_minor__ ;
#if (__clang_major__ == 3) && (__clang_minor__ >= 4) #if (__clang_major__ > 3) || ((__clang_major__ == 3) && (__clang_minor__ >= 4))
#ifdef __clang_patchlevel__ #ifdef __clang_patchlevel__
icg_dir << "." << __clang_patchlevel__ ; icg_dir << "." << __clang_patchlevel__ ;
#endif #endif
#endif #endif
icg_dir << "/include" ; icg_dir << "/include" ;
#if (__clang_major__ == 3) && (__clang_minor__ >= 3) char * resolved_path = realpath(icg_dir.str().c_str(), NULL ) ;
hso.AddPath(icg_dir.str() , clang::frontend::System, IsFramework, IsSysRootRelative); if ( resolved_path != NULL ) {
#else hso.AddPath(resolved_path , clang::frontend::System, IsFramework, IsSysRootRelative);
hso.AddPath(icg_dir.str() , clang::frontend::System, IsUserSupplied, IsFramework, IsSysRootRelative); }
#endif
#endif #endif
fp = popen("${TRICK_HOME}/bin/gte TRICK_CPPC" , "r") ; fp = popen("${TRICK_HOME}/bin/gte TRICK_CPPC" , "r") ;