summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2018-04-17 11:53:55 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2018-05-17 12:46:37 +0000
commit319daa2612dcdd205e271cf2b4b5bf4532fad163 (patch)
treeb67dcbf4424c1cc00475b0ead75b218fb66e2942 /README.md
parentc49854f423af755191a375dc030157f929648ced (diff)
downloadqt-creator-319daa2612dcdd205e271cf2b4b5bf4532fad163.tar.gz
Clang: Require LLVM/Clang >= 6.0.0
Adapt versions and tests, remove code assuming clang < 6.0. Switch also to our custom repositories instead of dealing with patch files. LLVM/Clang 6 was released on 09 Mar 2018. Task-number: QTCREATORBUG-18535 Task-number: QTCREATORBUG-18552 Change-Id: I0ec2c2f56265e161ae7cbb5b03e7b8a182ba6cc6 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'README.md')
-rw-r--r--README.md19
1 files changed, 11 insertions, 8 deletions
diff --git a/README.md b/README.md
index af745d7326..7595e7c162 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Prerequisites:
* jom
* On Mac OS X: latest Xcode
* On Linux: g++ 4.9 or later
-* LLVM/Clang 5.0.0 or later (optional, needed for the Clang Code Model, see the
+* LLVM/Clang 6.0.0 or later (optional, needed for the Clang Code Model, see the
section "Get LLVM/Clang for the Clang Code Model")
* CMake (only for manual builds of LLVM/Clang)
* Qbs 1.7.x (optional, sources also contain Qbs itself)
@@ -206,7 +206,7 @@ or using shadow builds.
## Get LLVM/Clang for the Clang Code Model
The Clang Code Model depends on the LLVM/Clang libraries. The currently
-supported LLVM/Clang version is 5.0.
+supported LLVM/Clang version is 6.0.
### Prebuilt LLVM/Clang packages
@@ -233,9 +233,9 @@ GCC 4 binaries. On Ubuntu, you can download the package from
http://apt.llvm.org/ with:
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
- sudo apt-add-repository "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-5.0 main"
+ sudo apt-add-repository "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-6.0 main"
sudo apt-get update
- sudo apt-get install llvm-5.0 libclang-5.0-dev
+ sudo apt-get install llvm-6.0 libclang-6.0-dev
There is a workaround to set _GLIBCXX_USE_CXX11_ABI to 1 or 0, but we recommend
to download the package from http://apt.llvm.org/.
@@ -251,11 +251,11 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
1. Clone LLVM and checkout a suitable branch
- git clone -b release_50 https://git.llvm.org/git/llvm
+ git clone -b release_60-based git://code.qt.io/clang/llvm.git
2. Clone Clang into llvm/tools/clang and checkout a suitable branch
- git clone -b release_50 https://git.llvm.org/git/clang llvm/tools/clang
+ git clone -b release_60-based git://code.qt.io/clang/clang.git llvm/tools/clang
3. Build and install LLVM/Clang
@@ -285,7 +285,8 @@ we thank the authors who made this possible:
Distributed under GNU LIBRARY GENERAL PUBLIC LICENSE Version 2 (LGPL2).
- Integrated with patches from QtCreator/dist/clang/patches, see README.md there.
+ Integrated with patches from
+ http://code.qt.io/cgit/clang/clang-tools-extra.git/.
### LLVM/Clang
@@ -298,7 +299,9 @@ we thank the authors who made this possible:
Distributed under the University of Illinois/NCSA Open Source License (NCSA),
see https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT
- With additional patches from QtCreator/dist/clang/patches, see README.md there.
+ With backported/additional patches from
+ http://code.qt.io/cgit/clang/llvm.git/
+ http://code.qt.io/cgit/clang/clang.git/
### Reference implementation for std::experimental::optional