diff options
| author | Pierre Joye <pajoye@php.net> | 2010-08-15 13:54:03 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-08-15 13:54:03 +0000 |
| commit | 7dd694ec1576524b9cb2bc807c7cb92a2c4c036a (patch) | |
| tree | e3556780008b9e1bb750d599b1fd3df3f0fa7696 | |
| parent | fe07ed4b42c0c22df63db29bd3245173432188ff (diff) | |
| download | php-git-7dd694ec1576524b9cb2bc807c7cb92a2c4c036a.tar.gz | |
- #52607, fix ENV conflit with win SDK 7.1
| -rw-r--r-- | win32/build/Makefile | 4 | ||||
| -rw-r--r-- | win32/build/config.w32 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index bb576ea67a..1377342991 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -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 @@ dist: all build-dist 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)" diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 0910e16f78..4ed7fe8bf9 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -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,7 +17,7 @@ if (!CL) { // 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]); if (VCVERS < 1500) { @@ -29,7 +29,7 @@ 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, null, 'PHP_CL'); if (X64) { STDOUT.WriteLine(" Detected 64-bit compiler"); } else { |