svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile config.w32
| From: | Pierre Joye | Date: | Sun, 15 Aug 2010 03:38:08 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3/win32/build/ Makefile config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63287@lists.php.net to get a copy of this message | ||
pajoye Sun, 15 Aug 2010 03:38:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=302247
Log:
- #52607, fix ENV conflit with win SDK 7.1
Bug: http://bugs.php.net/52607 (Feedback) PHP won't
compile with VS2010
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 01:58:36 UTC (rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2010-08-15 03:38:08 UTC (rev 302247)
@@ -17,7 +17,7 @@
# $Id$
# This is the makefile template for the win32 build
-CC="$(CL)"
+CC="$(PHP_CL)"
LD="$(LINK)"
MC="$(MC)"
MT="$(MT)"
@@ -146,7 +146,7 @@
snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe: win32\build\deplister.c
- $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR)
/Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
+ $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR)
/Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)"
"$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)"
"$(PECL_TARGETS)"
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 01:58:36 UTC (rev 302246)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2010-08-15 03:38:08 UTC (rev 302247)
@@ -4,8 +4,8 @@
// equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system',
'\\cygwin');
-CL = PATH_PROG('cl');
-if (!CL) {
+PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
+if (!PHP_CL) {
ERROR("MS C++ compiler is required");
}
@@ -17,14 +17,14 @@
// 1500 is vs.net 2008
// 1600 is vs.net 2010
// Which version of the compiler do we have?
-VCVERS = probe_binary(CL).substr(0, 5).replace('.', '');
+VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
AC_DEFINE('COMPILER', VC_VERSIONS[VCVERS], "Detected compiler version");
DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility
ID");
// do we use x64 or 80x86 version of compiler?
-X64 = probe_binary(CL, 64);
+X64 = probe_binary(PHP_CL, 64);
if (X64) {
STDOUT.WriteLine(" Detected 64-bit compiler");
} else {