forked from github/server
strip down the configure script to do only configuration, not builds.
remove distcc support, because I do not have it set up anywhere I can test it.
This commit is contained in:
parent
dd408da3f4
commit
f51e5f91ff
|
@ -1,18 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
git submodule update --init
|
git submodule update --init
|
||||||
|
s/cmake-init
|
||||||
DISTCC=`which distcc`
|
echo "configuration complete. run s/build to build the server"
|
||||||
if [ ! -z "$DISTCC" ] ; then
|
|
||||||
JOBS=`distcc -j`
|
|
||||||
if [ -z "$JOBS" ] ; then
|
|
||||||
JOBS=1
|
|
||||||
elif [ $JOBS -gt 1 ] ; then
|
|
||||||
CC="$DISTCC $CC"
|
|
||||||
MAKEOPTS=-j$JOBS
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "Building with $CC and $JOBS jobs"
|
|
||||||
|
|
||||||
CC="$CC" s/cmake-init
|
|
||||||
make -j$JOBS
|
|
||||||
make test
|
|
||||||
|
|
|
@ -17,11 +17,6 @@ BIN_DIR="build-$MACHINE-$CC-$BUILD"
|
||||||
mkdir -p $BIN_DIR
|
mkdir -p $BIN_DIR
|
||||||
cd $BIN_DIR
|
cd $BIN_DIR
|
||||||
|
|
||||||
if [ ! -e ../CMakeLists.txt ]; then
|
|
||||||
echo "are you sure you are in the build directory?"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
MACHINE=$(gcc -dumpmachine)
|
MACHINE=$(gcc -dumpmachine)
|
||||||
rm -f CMakeCache.txt
|
rm -f CMakeCache.txt
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue