Commit d2056783 authored by Vitaly Lipatov's avatar Vitaly Lipatov

dmake: add support 64 bit build and build i586 on x86_64

parent 05e38542
...@@ -8,21 +8,23 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ] ; then ...@@ -8,21 +8,23 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ] ; then
exit 0 exit 0
fi fi
export DISTCC_HOSTS
echo "Build on '$DISTCC_HOSTS' hosts"
if [ -z "$DISTCC_HOSTS" ] || [ -z "$DISTCC_HOSTS_NUM" ] ; then
fatal "Set DISTCC_HOSTS and DISTCC_HOSTS_NUM var in config"
fi
DISTCC=$(which distcc 2>/dev/null) DISTCC=$(which distcc 2>/dev/null)
[ -n "$DISTCC" ] || fatal "Install distcc for run distributed make via dmake" [ -n "$DISTCC" ] || fatal "Install distcc for run distributed make via dmake"
if [ "$DEFAULTARCH" = "x86_64" ] ; then if [ "$DEFAULTARCH" = "x86_64" ] ; then
fatal "x86_64 is not supported yet" export DISTCC_HOSTS="$DISTCC_64_HOSTS"
DISTCC_HOSTS_NUM=$DISTCC_64_HOSTS_NUM
else else
export DISTCC_HOSTS="$DISTCC_32_HOSTS $DISTCC_64_HOSTS"
DISTCC_HOSTS_NUM=$(($DISTCC_32_HOSTS_NUM + $DISTCC_64_HOSTS_NUM))
DISTCC="$DISTCC -m32" DISTCC="$DISTCC -m32"
fi fi
echo "Build on '$DISTCC_HOSTS' hosts ($DEFAULTARCH arch)"
if [ -z "$DISTCC_HOSTS" ] || [ -z "$DISTCC_HOSTS_NUM" ] ; then
fatal "Set DISTCC_HOSTS and DISTCC_HOSTS_NUM var in config"
fi
showcmd time -p make -j$DISTCC_HOSTS_NUM CC="$DISTCC" CXX="$DISTCC" $@ showcmd time -p make -j$DISTCC_HOSTS_NUM CC="$DISTCC" CXX="$DISTCC" $@
time -p make -j$DISTCC_HOSTS_NUM CC="$DISTCC" CXX="$DISTCC" $@ time -p make -j$DISTCC_HOSTS_NUM CC="$DISTCC" CXX="$DISTCC" $@
...@@ -83,5 +83,10 @@ ...@@ -83,5 +83,10 @@
# distcc support in jmake # distcc support in jmake
# https://wiki.office.etersoft.ru/devel/distrubutedcompilation # https://wiki.office.etersoft.ru/devel/distrubutedcompilation
# DISTCC_HOSTS="euclid atlant" # i586 only systems
# DISTCC_HOSTS_NUM=12 # DISTCC_32_HOSTS="euclid atlant"
# DISTCC_32_HOSTS_NUM=12
# x86_64 (gcc -m32 supports too)
# DISTCC_64_HOSTS="builder64"
# DISTCC_64_HOSTS_NUM=12
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment