diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 11:47:59 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-03-07 11:47:59 -0800 |
| commit | 7c050445a9067fac39d8cf3544f8df8e6704cca8 (patch) | |
| tree | f3b21d0c6f5d1b1e5335ee8f80eb91e2187cdf36 /src | |
| parent | a752453098d90bfec397a8cafca55bc56b5a7ef8 (diff) | |
| parent | 7f465abd4f5c3269b1c7b2e99eeb1ff56fe846d5 (diff) | |
| download | rust-7c050445a9067fac39d8cf3544f8df8e6704cca8.tar.gz rust-7c050445a9067fac39d8cf3544f8df8e6704cca8.zip | |
Merge branch 'shard-msvc-more' of https://github.com/alexcrichton/rust into rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 1 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 925a361f0b2..97ea792c780 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -60,6 +60,7 @@ check-aux: src/test/run-pass-valgrind/pretty \ src/test/run-pass-fulldeps/pretty \ src/test/run-fail-fulldeps/pretty \ + $(AUX_ARGS) \ $(BOOTSTRAP_ARGS) check-bootstrap: $(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py diff --git a/src/ci/run.sh b/src/ci/run.sh index 3be1c255c16..79300e08a7d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -104,7 +104,7 @@ else travis_fold start "make-$1" travis_time_start echo "make -j $ncpus $1" - make -j $ncpus "$1" + make -j $ncpus $1 local retval=$? travis_fold end "make-$1" travis_time_finish |