diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-25 18:42:47 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 18:42:47 -0700 |
| commit | 15e5c3f4068405cb55d4a920c7959ecbd536518d (patch) | |
| tree | 36d9ec5af901509481a083cad6cc44b801c654bb /src | |
| parent | 8a1247a42c355332e0fc0233c90e1a95009d87a1 (diff) | |
| parent | 211a2a0f1266ac741060c0e61a070839e3904cd0 (diff) | |
Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile
PHP: add PHP7 to various Jenkins tests and update dockerfile
Diffstat (limited to 'src')
| -rwxr-xr-x | src/php/bin/determine_extension_dir.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/php/bin/determine_extension_dir.sh b/src/php/bin/determine_extension_dir.sh index b4342ac89f..a59882506f 100755 --- a/src/php/bin/determine_extension_dir.sh +++ b/src/php/bin/determine_extension_dir.sh @@ -29,11 +29,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. set -e default_extension_dir=$(php-config --extension-dir) -if command -v brew > /dev/null && \ - brew ls --versions | grep php5[56]-grpc > /dev/null; then - # the grpc php extension was installed by homebrew - : -elif [ ! -e $default_extension_dir/grpc.so ]; then +if [ ! -e $default_extension_dir/grpc.so ]; then # the grpc extension is not found in the default PHP extension dir # try the source modules directory module_dir=../ext/grpc/modules |