Skip to content

Commit

Permalink
compiles; shipped ;)
Browse files Browse the repository at this point in the history
  • Loading branch information
rpav committed Jun 15, 2021
1 parent 0255131 commit 3a92064
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ project(c2ffi)
set(SOURCE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})

# Apparently the LLVM package doesn't support ranges
find_package(LLVM 11.1.0 CONFIG)
if(NOT LLVM_FOUND)
find_package(LLVM 11.0.0 REQUIRED CONFIG)
endif()

find_package(LLVM 12.0.0 CONFIG)

find_package(Clang)

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ LLVM/Clang:
* Anything earlier: *unsupported*
* 10.0.0: branch `llvm-10.0.0` *deprecated*
* 11.0.0: branch `llvm-11.0.0` **current**
* 12.0.0: branch `llvm-12.0.0` *testing*

Developement will always take place in `llvm-X.Y`, according to the
appropriate version of LLVM. **The *master* branch has been
Expand Down
4 changes: 2 additions & 2 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ void c2ffi::init_ci(config &c, clang::CompilerInstance &ci) {
if(c.wchar_size != 0)
lo.WCharSize = c.wchar_size;

clang::PreprocessorOptions preopts;
ci.getInvocation().setLangDefaults(lo, c.kind, pti->getTriple(), preopts, c.std);
std::vector<std::string> includes;
ci.getInvocation().setLangDefaults(lo, c.kind, pti->getTriple(), includes, c.std);
ci.createFileManager();
ci.createSourceManager(ci.getFileManager());

Expand Down

0 comments on commit 3a92064

Please sign in to comment.