Fixed ninja usages

.orchestra/config/components/clang_release.yml

@@ -2,6 +2,7 @@
 #@ load("@ytt:overlay", "overlay")
 #@ load("/components/llvm_common.lib.yml", "configure_llvm")
 #@ load("/lib/create_component.lib.yml", "single_build_component")
+#@ load("/lib/ninja.lib.yml", "ninja")
 
 ---
 #@ def cmake_opts():
@@ -20,7 +21,7 @@ configure: |
 install: |
   cd "$BUILD_DIR"
 
-  ninja install
+  (@= ninja @) install
 
   rm "${DESTDIR}${ORCHESTRA_ROOT}/lib64/libc++.so" || true
   echo 'INPUT(libc++.so.1 -lc++abi -lpthread)' > "${DESTDIR}${ORCHESTRA_ROOT}/lib64/libc++.so"

.orchestra/config/components/llvm.yml

 #@ load("@ytt:data", "data")
 #@ load("@ytt:overlay", "overlay")
-#@ load("/lib/optimization_flavors.lib.yml", "typical_project_flavors")
 #@ load("/components/llvm_common.lib.yml", "configure_llvm")
+#@ load("/lib/optimization_flavors.lib.yml", "typical_project_flavors")
 #@ load("/lib/fn_args.lib.yml", "mandatory")
+#@ load("/lib/ninja.lib.yml", "ninja")
 
 #@yaml/text-templated-strings
 ---
@@ -27,7 +28,7 @@ builds:
       configure: #@ configure_llvm(cmake_build_type=build_type, cflags=cflags, additional_cmake_options=cmake_opts(), source_dir="$SOURCE_DIR")
       install: |
         cd "$BUILD_DIR"
-        ninja ${JOBS:+-j$JOBS} install
+        (@= ninja @) install
 
         CLANG_RELEASE_IDX="$ORCHESTRA_ROOT/share/orchestra/clang-release.idx"
         if [ -e "$CLANG_RELEASE_IDX" ]; then

.orchestra/config/lib/cmake.lib.yml

@@ -100,7 +100,7 @@
 
     cd "$BUILD_DIR";
     cmake "$SOURCE_DIR" \
-      (@ if build_system != "Ninja": @)-G(@= build_system @)(@ end @) \
+      -G"(@= build_system @)" \
       -DCMAKE_TOOLCHAIN_FILE="$BUILD_DIR/toolchain.cmake" \
       -DCMAKE_INSTALL_PREFIX="$ORCHESTRA_ROOT" \
       (@= expand_args(extra_cmake_args) @)

.orchestra/config/lib/create_component.lib.yml

@@ -3,6 +3,7 @@
 #@ load("/lib/fn_args.lib.yml", "mandatory")
 #@ load("/lib/assert.lib.yml", "fail")
 #@ load("/lib/make.lib.yml", "make")
+#@ load("/lib/ninja.lib.yml", "ninja")
 
 #@yaml/text-templated-strings
 ---
@@ -42,7 +43,7 @@ builds:
       (@= make @) install
       (@- elif build_system == "ninja": @)
       cd "$BUILD_DIR"
-      ninja install
+      (@= ninja @) install
       (@- elif install: @)
       (@-= install -@)
       (@- else: @)