ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-22 08:50:06 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

/usr/lib64/llvm/clang/3.4.2 not found

Browse Source 
Modified the makefile for ICG to be able to use clang from yum, fink, and manual installs.  Removed the requirement for copying the clang friendly header files into Trick.  However Trick will be expecting the clang header files to be in it's search path.

refs #40
This commit is contained in:
Alex Lin
2015-06-04 13:17:53 -05:00
parent 60e3983344
commit c5d0b2a872
5 changed files with 41 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
trick_source/codegen/Interface_Code_Gen/main.cpp
View File

@ -62,7 +62,7 @@ Most of the main program is pieced together from examples on the web. We are doi
*/
int main( int argc , char * argv[] ) {
#if (__clang_major__ == 3) && (__clang_minor__ >= 5)
#if (__clang_major__ >= 6) || ((__clang_major__ == 3) && (__clang_minor__ >= 5))
clang::TargetOptions to;
#elif (__clang_major__ == 3) && (__clang_minor__ >= 3)
clang::TargetOptions * to = new clang::TargetOptions() ;
@ -85,11 +85,7 @@ int main( int argc , char * argv[] ) {
return 0 ;
}
#if (__clang_major__ == 3) && (__clang_minor__ >= 3)
ci.createDiagnostics();
#else
ci.createDiagnostics(0,NULL);
#endif
clang::DiagnosticOptions & diago = ci.getDiagnosticOpts() ;
diago.ShowColors = 1 ;
ci.getDiagnostics().setIgnoreAllWarnings(true) ;
@ -102,14 +98,10 @@ int main( int argc , char * argv[] ) {
ci.getLangOpts().CXXExceptions = true ;
// Activate C++11 parsing
#if (__clang_major__ == 3) && (__clang_minor__ >= 3)
ci.getLangOpts().CPlusPlus11 = true ;
#else
ci.getLangOpts().CPlusPlus0x = true ;
#endif
// Set the default target architecture
#if (__clang_major__ == 3) && (__clang_minor__ >= 5)
#if (__clang_major__ >= 6) || (__clang_major__ == 3) && (__clang_minor__ >= 5)
to.Triple = llvm::sys::getDefaultTargetTriple();
#elif (__clang_major__ == 3) && (__clang_minor__ >= 3)
to->Triple = llvm::sys::getDefaultTargetTriple();
@ -117,7 +109,7 @@ int main( int argc , char * argv[] ) {
to.Triple = llvm::sys::getDefaultTargetTriple();
#endif
#if (__clang_major__ == 3) && (__clang_minor__ >= 5)
#if (__clang_major__ >= 6) || (__clang_major__ == 3) && (__clang_minor__ >= 5)
std::shared_ptr<clang::TargetOptions> shared_to = std::make_shared<clang::TargetOptions>(to) ;
clang::TargetInfo *pti = clang::TargetInfo::CreateTargetInfo(ci.getDiagnostics(), shared_to);
#else
@ -128,7 +120,7 @@ int main( int argc , char * argv[] ) {
// Create all of the necessary managers.
ci.createFileManager();
ci.createSourceManager(ci.getFileManager());
#if (__clang_major__ == 3) && (__clang_minor__ >= 5)
#if (__clang_major__ >= 6) || (__clang_major__ == 3) && (__clang_minor__ >= 5)
ci.createPreprocessor(clang::TU_Complete);
#else
ci.createPreprocessor();
@ -151,12 +143,7 @@ int main( int argc , char * argv[] ) {
// Add our comment saver as a comment handler in the preprocessor
CommentSaver cs(ci.getSourceManager()) ;
#if (__clang_major__ == 3) && (__clang_minor__ >= 3)
pp.addCommentHandler(&cs) ;
#else
pp.AddCommentHandler(&cs) ;
#endif
PrintAttributes pa( attr_version, hsd, cs, ci, force, sim_services_flag) ;
@ -165,7 +152,7 @@ int main( int argc , char * argv[] ) {
// Tell the compiler to use our ICGASTconsumer
ICGASTConsumer *astConsumer = new ICGASTConsumer(ci, hsd, cs, pa);
#if (__clang_major__ == 3) && (__clang_minor__ >= 6)
#if (__clang_major__ >= 6) || ((__clang_major__ == 3) && (__clang_minor__ >= 6))
std::unique_ptr<clang::ASTConsumer> unique_ast(astConsumer) ;
ci.setASTConsumer(std::move(unique_ast));
#else
@ -186,7 +173,7 @@ int main( int argc , char * argv[] ) {
// Open up the input file and parse it.
const clang::FileEntry *pFile = ci.getFileManager().getFile(input_file_full_path);
#if (__clang_major__ == 3) && (__clang_minor__ >= 5)
#if (__clang_major__ >= 6) || ((__clang_major__ == 3) && (__clang_minor__ >= 5))
ci.getSourceManager().setMainFileID(ci.getSourceManager().createFileID(pFile, clang::SourceLocation(), clang::SrcMgr::C_User));
#else
ci.getSourceManager().createMainFileID(pFile);