diff options
author | Sara Golemon <pollita@php.net> | 2020-04-24 01:27:40 +0000 |
---|---|---|
committer | Sara Golemon <pollita@php.net> | 2020-04-24 01:27:40 +0000 |
commit | 41a04f96b487e642f3c046636f13412d95759b17 (patch) | |
tree | e6a4f6f3eb65c807bdba7927892848c03b844f76 /travis | |
parent | 53e033130232ebc1b09ffbd91f8a62e148b1b2e5 (diff) | |
download | php-git-41a04f96b487e642f3c046636f13412d95759b17.tar.gz |
Remove dead checks for LOG_FILE paths, replace with CONFIG_ONLY option
Diffstat (limited to 'travis')
-rwxr-xr-x | travis/compile.sh | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/travis/compile.sh b/travis/compile.sh index 7af4bb21b0..81e0750874 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -15,21 +15,6 @@ else S390X_CONFIG=""; fi -if [[ -z "$CONFIG_LOG_FILE" ]]; then - CONFIG_QUIET="--quiet" - CONFIG_LOG_FILE="/dev/stdout" -else - CONFIG_QUIET="" -fi -if [[ -z "$MAKE_LOG_FILE" ]]; then - MAKE_QUIET="--quiet" - MAKE_LOG_FILE="/dev/stdout" -else - MAKE_QUIET="" -fi - -MAKE_JOBS=${MAKE_JOBS:-$(nproc)} - ./buildconf --force ./configure \ --enable-option-checking=fatal \ @@ -86,5 +71,8 @@ $S390X_CONFIG \ --enable-werror \ --with-pear -make "-j${MAKE_JOBS}" $MAKE_QUIET -make install +if [[ -z "$CONFIG_ONLY" ]]; then + MAKE_JOBS=${MAKE_JOBS:-$(nproc)} + make "-j${MAKE_JOBS}" $MAKE_QUIET + make install +fi |