Skip to content

Ported to LLVM 5.0 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adhokshajmishra wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ported to LLVM 5.0 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72e30c
Ported to LLVM 5.0
adhokshajmishra Sep 17, 2017
9781d1a
ported to LLVM-6.0
adhokshajmishra Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SourceWeb currently runs on Linux and OS X.

SourceWeb is written in C++11. The indexer links against Clang's C++ API.
Clang's C++ APIs are not compatible between releases, so this version of
SourceWeb requires exactly Clang 4.0. The GUI uses Qt 4.6 or later. Follow
SourceWeb requires exactly Clang 6.0. The GUI uses Qt 4.6 or later. Follow
the build instructions to satisfy these dependencies.


Expand All @@ -24,7 +24,7 @@ Install prerequisite packages:
Debian-based:

sudo apt-get install make g++ libqt4-dev zlib1g-dev libncurses5-dev \
libclang-3.8-dev llvm-3.8-dev
libclang-6.0-dev llvm-6.0-dev

Fedora/CentOS:

Expand Down
8 changes: 3 additions & 5 deletions check-clang.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Clang installation.
#

REQUIRED_CLANG_VERSION = 4.0
REQUIRED_CLANG_VERSION = 6.0

equals(CLANG_DIR, "") {
warning("The CLANG_DIR qmake variable is unset.")
Expand All @@ -29,9 +29,7 @@ checkClangRequire($${CLANG_DIR}/include/clang/AST/ASTContext.h)
CLANG_LIBS = \
clangFrontend clangSerialization clangDriver \
clangTooling clangParse clangSema clangAnalysis \
clangEdit clangAST clangLex clangBasic \
LLVMMC LLVMMCParser LLVMObject LLVMAsmParser LLVMCore LLVMProfileData LLVMSupport \
LLVMOption LLVMBitWriter LLVMBitReader LLVMDemangle
clangEdit clangAST clangLex clangBasic LLVM-6.0
for(CLANG_LIB, CLANG_LIBS) {
checkClangRequire($${CLANG_DIR}/lib/lib$${CLANG_LIB}.a)
checkClangRequire($${CLANG_DIR}/lib/lib$${CLANG_LIB}.so)
}
2 changes: 1 addition & 1 deletion clang-indexer/IndexerPPCallbacks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class IndexerPPCallbacks : public clang::PPCallbacks
virtual void MacroDefined(const clang::Token &macroNameToken,
const clang::MacroDirective *md) override;
virtual void MacroUndefined(const clang::Token &macroNameTok,
const clang::MacroDefinition &md) override;
const clang::MacroDefinition &md);
virtual void Defined(const clang::Token &macroNameToken,
const clang::MacroDefinition &md,
clang::SourceRange range) override;
Expand Down
4 changes: 2 additions & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
set -u

CLANG_VER=4.0
CLANG_VER=6.0
SRCDIR=$(cd "$(dirname "$0")" && pwd)

usage() {
Expand Down Expand Up @@ -76,7 +76,7 @@ find_clang() {
fi
for ITEM in \
include/clang/AST/ASTContext.h \
lib/libclangTooling.a \
lib/libclangTooling.so \
lib/libLLVMCore.a \
; do
ITEM_PATH=$CANDIDATE/$ITEM
Expand Down