Skip to content

Commit d587e0f

Browse files
committed
Always distclean before building. ccache can speed things up for us
1 parent 7e9c05d commit d587e0f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

peg

+6-6
Original file line numberDiff line numberDiff line change
@@ -452,18 +452,18 @@ function detect_cpus {
452452

453453
if [ -z "$CPUS" ]; then
454454
# If there's no more accurate guess, running make with 4 processes works
455-
# well enough on typical hardware circa 2012.
455+
# well enough on typical hardware circa 2012.
456456
CPUS=4
457457
fi
458458
}
459459

460460
function build {
461461
cd $PGSRC/$PGPROJECT
462-
if [ -f GNUmakefile ] ; then
463-
echo WARNING: Build found an existing GNUmakefile, not running configure again
464-
else
465-
./configure --prefix=$PGINST/$PGPROJECT --enable-depend --enable-thread-safety $PGDEBUG
466-
fi
462+
463+
$PGMAKE distclean # always clean first, files in working dir may belong to
464+
# may belong to the branch we just checked out of
465+
466+
./configure --prefix=$PGINST/$PGPROJECT --enable-depend --enable-thread-safety $PGDEBUG
467467

468468
detect_cpus
469469
if [ -z "$CPUS" ] ; then

0 commit comments

Comments
 (0)