diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-27 09:51:13 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-27 09:51:13 +0000 |
| commit | de97def3fc6a8ff75f9f534c77007b8dba1043d3 (patch) | |
| tree | e617eaa17136cd38bb0a3e5001441869f3d2984d | |
| parent | a5d91b277b50f9d1b7d62c507b36d798761e2a57 (diff) | |
Merging r340376:
------------------------------------------------------------------------
r340376 | steveire | 2018-08-22 03:11:18 +0200 (Wed, 22 Aug 2018) | 7 lines
Update the docs for using LLVM toolset in Visual Studio
Reviewers: hans
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D51079
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_70@340730 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | docs/UsersManual.rst | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/docs/UsersManual.rst b/docs/UsersManual.rst index 363bb4e461..e0dc31f432 100644 --- a/docs/UsersManual.rst +++ b/docs/UsersManual.rst @@ -2711,16 +2711,17 @@ Command Prompt or a regular Command Prompt where the environment has been set up using e.g. `vcvarsall.bat <http://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx>`_. clang-cl can also be used from inside Visual Studio by selecting the LLVM -Platform Toolset. The toolset is installed by the LLVM installer, which can be -downloaded from the `LLVM release <http://releases.llvm.org/download.html>`_ or -`snapshot build <http://llvm.org/builds/>`_ web pages. To use the toolset, -select a project in Solution Explorer, open its Property Page (Alt+F7), and in -the "General" section of "Configuration Properties" change "Platform Toolset" -to e.g. LLVM-vs2014. +Platform Toolset. The toolset is not part of the installer, but may be installed +separately from the +`Visual Studio Marketplace <https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain>`_. +To use the toolset, select a project in Solution Explorer, open its Property +Page (Alt+F7), and in the "General" section of "Configuration Properties" +change "Platform Toolset" to LLVM. Doing so enables an additional Property +Page for selecting the clang-cl executable to use for builds. To use the toolset with MSBuild directly, invoke it with e.g. -``/p:PlatformToolset=LLVM-vs2014``. This allows trying out the clang-cl -toolchain without modifying your project files. +``/p:PlatformToolset=LLVM``. This allows trying out the clang-cl toolchain +without modifying your project files. It's also possible to point MSBuild at clang-cl without changing toolset by passing ``/p:CLToolPath=c:\llvm\bin /p:CLToolExe=clang-cl.exe``. @@ -2729,7 +2730,7 @@ When using CMake and the Visual Studio generators, the toolset can be set with t :: - cmake -G"Visual Studio 15 2017" -T LLVM-vs2014 .. + cmake -G"Visual Studio 15 2017" -T LLVM .. When using CMake with the Ninja generator, set the ``CMAKE_C_COMPILER`` and ``CMAKE_CXX_COMPILER`` variables to clang-cl: |