com php-src: Merge branch 'PHP-7.4': travis/compile.sh
| From: | Nikita Popov | Date: | Mon, 03 Aug 2020 12:48:40 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': travis/compile.sh | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-112512@lists.php.net to get a copy of this message | ||
Commit: 56f11e2d1fdda18d6c54c9878d3ff3f67eab1ebb
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 3 Aug 2020 14:48:40 +0200
Parents: c48b745f0090c944e77c1fbcfb6c4df3b54356ad c0fac0357c480cf6c60833ac55254d0734bab8b4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56f11e2d1fdda18d6c54c9878d3ff3f67eab1ebb
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
set -ex on travis/compile.sh
Changed paths:
MM travis/compile.sh
Diff:
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