diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-06 23:49:46 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-05-06 23:49:46 +0300 |
| commit | addd6ff33184614c6ad191436d34ea7528b17878 (patch) | |
| tree | 34a8efb72bfb266f9ab47d65522883eaac6e70a6 /docs | |
| parent | "toolchain" -> "toolset", part 1 (diff) | |
| download | cmake-common-addd6ff33184614c6ad191436d34ea7528b17878.tar.gz cmake-common-addd6ff33184614c6ad191436d34ea7528b17878.zip | |
"toolchain" -> "toolset", part 2
Diffstat (limited to '')
| -rw-r--r-- | docs/boost.md | 4 | ||||
| -rw-r--r-- | docs/cmake.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/boost.md b/docs/boost.md index 72cea4a..389630a 100644 --- a/docs/boost.md +++ b/docs/boost.md @@ -80,7 +80,7 @@ Windows & Clang --------------- Building Boost using Clang on Windows is a sad story. As of 2020, there're -three main ways to install the native Clang toolchain on Windows: +three main ways to install the native Clang toolset on Windows: * download the installer from llvm.org (`choco install llvm` does this) a.k.a. the upstream, @@ -98,7 +98,7 @@ clang-linux, and it's hardcoded to require the ar & ranlib executables to create static libraries. Which is fine on Linux, since, and I'm quoting the source, "ar is always available". But it's not fine on Windows, since ar/ranlib are not, in fact, available there by default. Sure, you can install -some kind of MinGW toolchain, and it might even work, but what the hell, +some kind of MinGW toolset, and it might even work, but what the hell, honestly? Luckily, both the upstream distribution and the MSYS2 mingw-w64-x86_64-llvm diff --git a/docs/cmake.md b/docs/cmake.md index d4685f8..aac40e0 100644 --- a/docs/cmake.md +++ b/docs/cmake.md @@ -62,7 +62,7 @@ Cross-compilation ----------------- If you want to e.g. build x86 binaries on x64 and vice versa, the easiest way -seems to be to make a CMake "toolchain file", which initializes the proper +seems to be to make a CMake "toolset file", which initializes the proper compiler flags (like -m64/-m32, etc.). Such file could look like this: set(CMAKE_C_COMPILER gcc) |