Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

let s/cmake-init take care of mkdir, not configure

This commit is contained in:
Enno Rehling 2014-07-02 21:22:41 -07:00
parent b5439a1279
commit 2aaabc0f12
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -1,12 +1,6 @@
#!/bin/sh #!/bin/sh
git submodule update --init git submodule update --init
MACHINE=`uname -m`
[ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc"
[ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc"
[ -z "$CC" ] && [ ! -z `which cc` ] && CC="cc"
[ -z "$JOBS" ] && JOBS=$(nproc)
BIN_DIR="build-$MACHINE-$CC-Debug"
DISTCC=`which distcc` DISTCC=`which distcc`
if [ ! -z "$DISTCC" ] ; then if [ ! -z "$DISTCC" ] ; then
JOBS=`distcc -j` JOBS=`distcc -j`
@ -19,8 +13,6 @@ fi
fi fi
echo "Building with $CC and $JOBS jobs" echo "Building with $CC and $JOBS jobs"
mkdir -p $BIN_DIR CC="$CC" s/cmake-init
cd $BIN_DIR
CC="$CC" ../s/cmake-init
make -j$JOBS make -j$JOBS
make test make test