From: Sara Golemon Date: Fri, 24 Apr 2020 01:27:40 +0000 (+0000) Subject: Remove dead checks for LOG_FILE paths, replace with CONFIG_ONLY option X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41a04f96b487e642f3c046636f13412d95759b17;p=php Remove dead checks for LOG_FILE paths, replace with CONFIG_ONLY option --- 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