summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSam Atkins <atkinssj@serenityos.org>2021-12-02 19:10:31 +0000
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-12-02 14:34:45 -0800
commit3a44b8111b7a9bd058aabf712ded8d1e86830d37 (patch)
tree7446876bcb63f69fd644e0107e56731fdf2aea0e /Documentation
parent8fb52c696201740b7c427a5fa34d5e13996d1936 (diff)
downloadserenity-3a44b8111b7a9bd058aabf712ded8d1e86830d37.zip
Documentation: Update instructions for using the Clang toolchain
The note that `Meta/serenity.sh` is incompatible with Clang is no longer true.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/AdvancedBuildInstructions.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/AdvancedBuildInstructions.md b/Documentation/AdvancedBuildInstructions.md
index 35e5051cb8..890205d53c 100644
--- a/Documentation/AdvancedBuildInstructions.md
+++ b/Documentation/AdvancedBuildInstructions.md
@@ -192,9 +192,6 @@ useful for stopping us from relying on compiler-specific behavior, and the built
bugs. Code compiled with both of these toolchains works identically in most cases, with the limitation that ports
can't be built with Clang yet.
-Note that `Meta/serenity.sh` is not yet supported, so the appropriate `ninja` targets (`install`, `image` and `run`)
-need to be invoked manually.
-
To build the Clang-based toolchain, run `BuildClang.sh` from the `Toolchain` directory. The script defaults to building
the tooling needed for 32-bit SerenityOS, but the `ARCH=x86_64` environment variable can be set to build the 64-bit
toolchain.
@@ -203,5 +200,6 @@ toolchain.
intervals. This generally happens if you have more CPU cores than free RAM in gigabytes. To fix this, limit the number
of parallel compile tasks be setting the `MAKEJOBS` environment variable to a number less than your CPU core count.
-Once the build script finishes, you can use it to compile SerenityOS if you set the `SERENITY_TOOLCHAIN` build
-option to `Clang` as shown [above](#cmake-build-options).
+Once the build script finishes, you can use it to compile SerenityOS. Either set the `SERENITY_TOOLCHAIN` build
+option to `Clang` as shown [above](#cmake-build-options), or pass `Clang` as the TOOLCHAIN option to
+`Meta/serenity.sh`, for example: `Meta/serenity.sh run i686 Clang`.