Commit:    d3dde81238c1ad1040fb269bea333bf8cc7ddeaa
Author:    Christoph M. Becker <[email protected]>         Mon, 8 Apr 2019 
13:51:03 +0200
Parents:   9bd1b4027ae837b0767558a737e81a4899d22155
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=d3dde81238c1ad1040fb269bea333bf8cc7ddeaa

Log:
Support older PHP SDKs

`PHP_SDK_VC` has been renamed to `PHP_SDK_VS` only as of
php-sdk-2.2.0beta4; therefore we add a fallback on `PHP_SDK_VC` to
support older versions.

Changed paths:
  M  include/BuildVC.php
  M  include/PeclBuildVC.php


Diff:
diff --git a/include/BuildVC.php b/include/BuildVC.php
index 21af5ce..e20970a 100644
--- a/include/BuildVC.php
+++ b/include/BuildVC.php
@@ -49,6 +49,9 @@ class BuildVC {
                }
 
                $sdk_vs = getenv("PHP_SDK_VS");
+               if (!$sdk_vs) { // fallback for versions before 
php-sdk-2.2.0beta4
+                       $sdk_vs = getenv("PHP_SDK_VC");
+               }
                if (strtolower($this->compiler) != strtolower($sdk_vs)) {
                        throw new \Exception("Compiler mismatch. PHP SDK is 
configured for '$sdk_vs', while the current RMTOOLS config targets 
'{$this->compiler}'");
                }
diff --git a/include/PeclBuildVC.php b/include/PeclBuildVC.php
index ef657c1..c985a73 100644
--- a/include/PeclBuildVC.php
+++ b/include/PeclBuildVC.php
@@ -49,6 +49,9 @@ class PeclBuildVC {
                }
 
                $sdk_vs = getenv("PHP_SDK_VS");
+               if (!$sdk_vs) { // fallback for versions before 
php-sdk-2.2.0beta4
+                       $sdk_vs = getenv("PHP_SDK_VC");
+               }
                if (strtolower($this->compiler) != strtolower($sdk_vs)) {
                        throw new \Exception("Compiler mismatch. PHP SDK is 
configured for '$sdk_vs', while the current RMTOOLS config targets 
'{$this->compiler}'");
                }


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to