Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
[Merge chakra-core/ChakraCore@ff22ab8fa5] [MERGE #3456 @obastemur] xp…
Browse files Browse the repository at this point in the history
…lat: fix multi-thread builds for node-chakracore

Merge pull request #3456 from obastemur:faster_make

Previously node-chakracore build process was failing if -j was used for multi-threaded builds. As a result, build was slow or failing.
  • Loading branch information
chakrabot authored and kfarnung committed Aug 10, 2017
1 parent 2585880 commit b6ed725
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion deps/chakrashim/core/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,13 @@ cmake $CMAKE_GEN $CC_PREFIX $ICU_PATH $LTO $STATIC_LIBRARY $ARCH $TARGET_OS \
_RET=$?
if [[ $? == 0 ]]; then
if [[ $MAKE != 0 ]]; then
$MAKE $MULTICORE_BUILD $_VERBOSE $WB_TARGET 2>&1 | tee build.log
# $MFLAGS comes from host `make` process. Sub `make` process needs this (recursional make runs)
TEST_MFLAGS="${MFLAGS}*!"
if [[ $TEST_MFLAGS != "*!" ]]; then
# Get -j flag from the host
MULTICORE_BUILD=""
fi
$MAKE $MFLAGS $MULTICORE_BUILD $_VERBOSE $WB_TARGET 2>&1 | tee build.log
_RET=${PIPESTATUS[0]}
else
echo "Visit given folder above for xcode project file ----^"
Expand Down

0 comments on commit b6ed725

Please sign in to comment.