From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 3 Aug 2020 12:48:40 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56f11e2d1fdda18d6c54c9878d3ff3f67eab1ebb;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  set -ex on travis/compile.sh
---

56f11e2d1fdda18d6c54c9878d3ff3f67eab1ebb
diff --cc travis/compile.sh
index 7966ea5b6b,3669643f9d..dc278c2e15
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@@ -1,6 -1,7 +1,7 @@@
  #!/bin/bash
+ set -ex
 -if [[ "$ENABLE_MAINTAINER_ZTS" == 1 ]]; then
 -	TS="--enable-maintainer-zts";
 +if [[ "$ENABLE_ZTS" == 1 ]]; then
 +	TS="--enable-zts";
  else
  	TS="";
  fi