Skip to content

E
etersoft-build-utils
Commit 3d746a59 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

dmake, jmake: cd to realpath to get real path in build

parent 90ce9169
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
bin/dmake
View file @ 3d746a59
...@@ -91,4 +91,5 @@ if [ -n "$PLAIN_DISTCC" ] ; then ...@@ -91,4 +91,5 @@ if [ -n "$PLAIN_DISTCC" ] ; then
# unset DISTCC_HOSTS # unset DISTCC_HOSTS
fi fi
cd_to_realcwd
docmd $NICE time -p $PUMP make -j$DISTCC_THREADS CC="$DISTCC" CXX="$DISTCXX" "$@" docmd $NICE time -p $PUMP make -j$DISTCC_THREADS CC="$DISTCC" CXX="$DISTCXX" "$@"
bin/jmake
View file @ 3d746a59
...@@ -23,4 +23,5 @@ MAKEARG="-j$NPROCS" ...@@ -23,4 +23,5 @@ MAKEARG="-j$NPROCS"
#[ "$(( $NPROCS - $LOADAVG ))" -gt 1 ] || MAKEARG="" #[ "$(( $NPROCS - $LOADAVG ))" -gt 1 ] || MAKEARG=""
#make $MAKEARG "CC=$CC" "CXX=$CXX" "CPP=$CPP" "CXXCPP=$CXXCPP" $@ #make $MAKEARG "CC=$CC" "CXX=$CXX" "CPP=$CPP" "CXXCPP=$CXXCPP" $@
cd_to_realcwd
docmd $NICE time -p make $MAKEARG $@ docmd $NICE time -p make $MAKEARG $@
share/eterbuild/functions/common
View file @ 3d746a59
...@@ -268,6 +268,11 @@ make_temp_file() ...@@ -268,6 +268,11 @@ make_temp_file()
fi fi
} }
cd_to_realcwd()
{
cd "$(realpath "$(pwd)" )"
}
# check if path is server:/path # check if path is server:/path
is_ssh_target() is_ssh_target()
{ {
......
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