From 1a56fe714cdcd57ab3287c700883a620248ad80c Mon Sep 17 00:00:00 2001 From: Paul Redmond Date: Fri, 5 Jun 2020 03:31:10 -0400 Subject: [PATCH] Toolchain: Support building the toolchain with Ninja (#2504) This change allows users to use CMAKE_GENERATOR=Ninja ./BuildIt.sh BuildIt.sh assumes the default cmake generator is Make. However, the user may specify CMAKE_GENERATOR=Ninja, for example, to set the default generator. Therefore, instead of calling make to build the LibC target we should call cmake --build to use the correct generated files. --- Toolchain/BuildIt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index d55dfd58ae..be1380232e 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -229,7 +229,7 @@ pushd "$DIR/Build/" mkdir -p "$BUILD" pushd "$BUILD" CXXFLAGS="-DBUILDING_SERENITY_TOOLCHAIN" cmake .. - "$MAKE" LibC + cmake --build . --target LibC install -D Libraries/LibC/libc.a Libraries/LibM/libm.a Root/usr/lib/ SRC_ROOT=$(realpath "$DIR"/..) for header in "$SRC_ROOT"/Libraries/Lib{C,M}/**/*.h; do