diff options
author | Felipe Pena <felipensp@gmail.com> | 2012-11-09 21:23:10 -0200 |
---|---|---|
committer | Felipe Pena <felipensp@gmail.com> | 2012-11-09 21:23:10 -0200 |
commit | 964acdaa3527225d06beb8f81724513c9b9dd8dd (patch) | |
tree | 10abd62805f96bbba3676b8cf8cb10c892fe7d7b | |
parent | 9d95f7d2861b22de1144f25ebe9a5891a9d7ca17 (diff) | |
parent | 44a6fe84113c152fbd24ec3be6d75ef72c4fbd0f (diff) | |
download | php-git-964acdaa3527225d06beb8f81724513c9b9dd8dd.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
-rw-r--r-- | config.guess | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.guess b/config.guess index f32079abda..d407b8cde6 100644 --- a/config.guess +++ b/config.guess @@ -532,7 +532,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 |