[builder][standalone-build] Move CMake verbose flags to right position

[kwk]

Summary

The --verbose flags to CMake introduced in D138120 were at the wrong place. This moves them to the right place.

zorg/buildbot/builders/annotated/standalone-build.sh

cmake ${CMAKE_TRACE_CONFIGURE_LLVM} \
         -DCMAKE_INSTALL_PREFIX=${LLVM_INSTALL_DIR} \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DLLVM_INCLUDE_UTILS:BOOL=ON \
         -DLLVM_INSTALL_UTILS:BOOL=ON \
         -DLLVM_UTILS_INSTALL_DIR:PATH=${LLVM_INSTALL_DIR}/bin \
         -DLLVM_CCACHE_BUILD=ON
 
     build_step "Building llvm"
-    cmake ${CMAKE_VERBOSE_BUILD_LLVM} --build ${LLVM_BUILD_DIR}
+    cmake --build ${LLVM_BUILD_DIR} ${CMAKE_VERBOSE_BUILD_LLVM}
     
     build_step "Testing llvm"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_CHECK_LLVM} --build ${LLVM_BUILD_DIR} --target check-all
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${LLVM_BUILD_DIR} --target check-all ${CMAKE_VERBOSE_CHECK_LLVM} 
 
     build_step "Installing llvm"
     rm -rf ${LLVM_INSTALL_DIR}
-    cmake ${CMAKE_VERBOSE_INSTALL_LLVM} --install ${LLVM_BUILD_DIR}
+    cmake --install ${LLVM_BUILD_DIR} ${CMAKE_VERBOSE_INSTALL_LLVM}
 
     # This is meant to extinguish any dependency on files being taken
     # from the llvm build dir when building clang.
     build_step "Removing llvm build dir"
     rm -rf "${LLVM_BUILD_DIR}"
 }
 
 build_clang() {
cmake ${CMAKE_TRACE_CONFIGURE_CLANG} \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit \
         -DCMAKE_INSTALL_PREFIX=${CLANG_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
         -DLLVM_ENABLE_ASSERTIONS=ON \
         -DLLVM_TABLEGEN_EXE=${LLVM_INSTALL_DIR}/bin/llvm-tblgen \
         -DLLVM_CCACHE_BUILD=ON
 
     build_step "Building clang"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_BUILD_CLANG} --build ${CLANG_BUILD_DIR}
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${CLANG_BUILD_DIR} ${CMAKE_VERBOSE_BUILD_CLANG}
 
     # TODO(kwk): Add Clang check
 
     build_step "Installing clang"
     rm -rf ${CLANG_INSTALL_DIR}
-    cmake ${CMAKE_VERBOSE_INSTALL_CLANG} --install ${CLANG_BUILD_DIR}
+    cmake --install ${CLANG_BUILD_DIR} ${CMAKE_VERBOSE_INSTALL_CLANG}
 
     build_step "Removing clang build dir"
     rm -rf ${CLANG_BUILD_DIR}
 }
 
 build_lld() {
     local LLVM_INSTALL_DIR=$(install_dir llvm)
     local PYTHON_LIT_INSTALL_DIR=$(install_dir python-lit)
cmake ${CMAKE_TRACE_CONFIGURE_LLD} \
         -DLLVM_LINK_LLVM_DYLIB=ON \
         -DCMAKE_INSTALL_PREFIX=${LLD_INSTALL_DIR} \
         -DLLVM_ROOT=${LLVM_INSTALL_DIR} \
         -DLLVM_CCACHE_BUILD=ON \
         -DLLVM_INCLUDE_TESTS=ON \
         -DLLVM_EXTERNAL_LIT=${PYTHON_LIT_INSTALL_DIR}/usr/local/bin/lit
 
     build_step "Building lld"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_BUILD_LLD} --build ${LLD_BUILD_DIR}
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${LLD_BUILD_DIR} ${CMAKE_VERBOSE_BUILD_LLD}
 
     build_step "Testing lld"
-    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake ${CMAKE_VERBOSE_CHECK_LLD} --build ${LLD_BUILD_DIR} --target check-lld
+    LD_LIBRARY_PATH="${LLVM_INSTALL_DIR}/lib64" cmake --build ${LLD_BUILD_DIR} --target check-lld ${CMAKE_VERBOSE_CHECK_LLD}
 
     build_step "Installing lld"
     rm -rf ${LLD_INSTALL_DIR}
-    cmake ${CMAKE_VERBOSE_INSTALL_LLD} --install ${LLD_BUILD_DIR}
+    cmake --install ${LLD_BUILD_DIR} ${CMAKE_VERBOSE_INSTALL_LLD}
 
     build_step "Removing lld build dir"
     rm -rf ${LLD_BUILD_DIR}
 }
 
 setup_llvm_project
 pre_build_cleanup
 
 build_python_lit
 discover_python_lit
 build_llvm
 build_clang
 build_lld
 
 exit 0