fix

Author: esigo

ci/do_ci.sh

@@ -60,7 +60,9 @@ mkdir -p "${BUILD_DIR}"
 mkdir -p "${PLUGIN_DIR}"
 
 IWYU=""
+MAKE_COMMAND="make -k -j \$(nproc)"
 if [[ "${CXX}" == "/usr/bin/clang++" ]]; then
+  MAKE_COMMAND="make -k CXX=include-what-you-use CXXFLAGS=\"-Xiwyu --error_always\" -j \$(nproc)"
   IWYU="-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=iwyu"
 fi
 
@@ -114,9 +116,9 @@ elif [[ "$1" == "cmake.maintainer.sync.test" ]]; then
         -DWITH_ASYNC_EXPORT_PREVIEW=OFF \
         -DOTELCPP_MAINTAINER_MODE=ON \
         -DWITH_NO_DEPRECATED_CODE=ON \
-        -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="iwyu" \
+        ${IWYU} \
         "${SRC_DIR}"
-  make -k CXX=include-what-you-use CXXFLAGS="-Xiwyu --error_always"
+  eval "$MAKE_COMMAND"
   make test
   exit 0
 elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
@@ -138,9 +140,9 @@ elif [[ "$1" == "cmake.maintainer.async.test" ]]; then
         -DWITH_ASYNC_EXPORT_PREVIEW=ON \
         -DOTELCPP_MAINTAINER_MODE=ON \
         -DWITH_NO_DEPRECATED_CODE=ON \
-        -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="iwyu" \
+        ${IWYU} \
         "${SRC_DIR}"
-  make -k CXX=include-what-you-use CXXFLAGS="-Xiwyu --error_always" -j $(nproc)
+  eval "$MAKE_COMMAND"
   make test
   exit 0
 elif [[ "$1" == "cmake.maintainer.cpp11.async.test" ]]; then
@@ -216,7 +218,7 @@ elif [[ "$1" == "cmake.c++20.test" ]]; then
         ${IWYU} \
         -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="iwyu" \
         "${SRC_DIR}"
-  make -k CXX=include-what-you-use CXXFLAGS="-Xiwyu --error_always" -j $(nproc)
+  eval "$MAKE_COMMAND"
   make test
   exit 0
 elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
@@ -230,7 +232,7 @@ elif [[ "$1" == "cmake.c++20.stl.test" ]]; then
         -DWITH_STL=ON \
         ${IWYU} \
         "${SRC_DIR}"
-  make -k CXX=include-what-you-use CXXFLAGS="-Xiwyu --error_always" -j $(nproc)
+  eval "$MAKE_COMMAND"
   make test
   exit 0
 elif [[ "$1" == "cmake.legacy.test" ]]; then