Skip to content

Commit 4756731

Browse files
committed
[MERGE chakra-core#1231 @obastemur] cross platform: remove second MAKE call from build
Merge pull request chakra-core#1231 from obastemur:fix_build_sh
2 parents a0f05a2 + d5c81cf commit 4756731

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,18 +198,18 @@ pushd $build_directory > /dev/null
198198
echo Generating $BUILD_TYPE makefiles
199199
cmake $CMAKE_GEN $CC_PREFIX $ICU_PATH $STATIC_LIBRARY -DCMAKE_BUILD_TYPE=$BUILD_TYPE ../..
200200

201+
_RET=$?
201202
if [[ $? == 0 ]]; then
202203
if [[ $MAKE != 0 ]]; then
203204
$MAKE $MULTICORE_BUILD 2>&1 | tee build.log
205+
_RET=${PIPESTATUS[0]}
204206
else
205207
echo "Visit given folder above for xcode project file ----^"
206208
fi
207209
fi
208210

209-
$MAKE $MULTICORE_BUILD 2>&1 | tee build.log
210-
_RET=${PIPESTATUS[0]}
211211
if [[ $_RET != 0 ]]; then
212-
echo Error: $MAKE return $_RET
212+
echo "See error details above. Exit code was $_RET"
213213
fi
214214

215215
popd > /dev/null

0 commit comments

Comments
 (0)