Skip to content

Commit 88072a3

Browse files
committed
[scripts] Fix CXX arg.
1 parent 3fda2a4 commit 88072a3

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

scripts/build.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,20 +194,22 @@ if [ ! -z ${CMAKE_GENERATOR+x} ]; then
194194
GENERATOR_ARG="-G ${CMAKE_GENERATOR}"
195195
fi
196196

197-
COMPILER_ARG=""
197+
COMPILER_ARG1=""
198198
if [ ! -z ${CC+x} ]; then
199199
COMPILER_ARG="-DCMAKE_C_COMPILER=${CC}"
200200
fi
201-
if [ ! -z ${CCX+x} ]; then
202-
COMPILER_ARG="${COMPILER_ARG} -DCMAKE_C_COMPILER=${CXX}"
201+
COMPILER_ARG2=""
202+
if [ ! -z ${CXX+x} ]; then
203+
COMPILER_ARG2="-DCMAKE_CXX_COMPILER=${CXX}"
203204
fi
204205

205206
if [ "${BUILD_EXT}" = true ]; then
206207
echo -e "\n${GREEN}Configure externals...${NC}"
207208

208209
eval_verbose cmake -S "${THIS_DIR}/external" -B "${EXTERNAL_BUILD_DIR}" \
209210
${GENERATOR_ARG:+"${GENERATOR_ARG}"} \
210-
${COMPILER_ARG:+"${COMPILER_ARG}"} \
211+
${COMPILER_ARG1:+"${COMPILER_ARG1}"} \
212+
${COMPILER_ARG2:+"${COMPILER_ARG2}"} \
211213
-DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
212214
-DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=NONE \
213215
-DCMAKE_INSTALL_MESSAGE=LAZY \
@@ -227,7 +229,8 @@ if [ "${BUILD_RADIUM}" = true ]; then
227229
eval_verbose cmake -S "${THIS_DIR}/" -B "${RADIUM_BUILD_DIR}" \
228230
-DCMAKE_EXECUTE_PROCESS_COMMAND_ECHO=NONE \
229231
${GENERATOR_ARG:+"${GENERATOR_ARG}"} \
230-
${COMPILER_ARG:+"${COMPILER_ARG}"} \
232+
${COMPILER_ARG1:+"${COMPILER_ARG1}"} \
233+
${COMPILER_ARG2:+"${COMPILER_ARG2}"} \
231234
-DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
232235
-DCMAKE_INSTALL_PREFIX="${RADIUM_INSTALL_DIR}" \
233236
-C "${EXTERNAL_INSTALL_DIR}/radium-options.cmake" \

0 commit comments

Comments
 (0)