From: Anatol Belski <ab@php.net>
Date: Fri, 7 Nov 2014 18:24:17 +0000 (+0100)
Subject: rename intel toolset to icc - shorter
X-Git-Tag: PRE_PHP7_REMOVALS~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af7e3064f35708fa9540ee1c18217811980f0865;p=php

rename intel toolset to icc - shorter
---

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index b6f45a9c64..da6d0d2ff5 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -83,7 +83,7 @@ if (PHP_GD != "no") {
 /D USE_GD_IOCTX \
 /D MSWIN32 \
 		");
-		if (INTEL_TOOLSET) {
+		if (ICC_TOOLSET) {
 			ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt");
 		}
 		
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index ebe8011148..2a1dd0a7c1 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -3,7 +3,7 @@
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
-ARG_WITH("toolset", "Toolset to use for the compilation, supported: vs, clang, intel", "vs");
+ARG_WITH("toolset", "Toolset to use for the compilation, supported: vs, clang, icc", "vs");
 toolset_option_handle();
 
 ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
@@ -281,7 +281,7 @@ ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");
 if (VS_TOOLSET && VCVERS <= 1300) {
 	ADD_SOURCES("win32", "strtoi64.c");
 }
-if (VS_TOOLSET && VCVERS >= 1400 || INTEL_TOOLSET) {
+if (VS_TOOLSET && VCVERS >= 1400 || ICC_TOOLSET) {
 	AC_DEFINE('HAVE_STRNLEN', 1);
 }
 
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index c3263ba5e9..0ced9b30a0 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -3,7 +3,7 @@
 // "Master" config file; think of it as a configure.in
 // equivalent.
 
-ARG_WITH("toolset", "Toolset to use for the compilation, supported: vs, clang, intel", "vs");
+ARG_WITH("toolset", "Toolset to use for the compilation, supported: vs, clang, icc", "vs");
 toolset_option_handle()
 
 var PHP_CYGWIN="notset";
@@ -244,7 +244,7 @@ if (VS_TOOLSET && VCVERS == 1200) {
 	AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
 }
 
-if (INTEL_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {
+if (ICC_TOOLSET || VS_TOOLSET && VCVERS >= 1400) {
 	AC_DEFINE('HAVE_STRNLEN', 1);
 }
 
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 0892c0068e..9d23c83a24 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -32,7 +32,7 @@ var PHP_SRC_DIR=FSO.GetParentFolderName(WScript.ScriptFullName);
 
 var VS_TOOLSET = true;
 var CLANG_TOOLSET = false;
-var INTEL_TOOLSET = false;
+var ICC_TOOLSET = false;
 var VCVERS = -1;
 var CLANGVERS = -1;
 var INTELVERS = -1;
@@ -2303,20 +2303,20 @@ function toolset_option_handle()
 	if ("clang" == PHP_TOOLSET) {
 		VS_TOOLSET = false;
 		CLANG_TOOLSET = true;
-		INTEL_TOOLSET = false;
-	} else if ("intel" == PHP_TOOLSET) {
+		ICC_TOOLSET = false;
+	} else if ("icc" == PHP_TOOLSET) {
 		VS_TOOLSET = false;
 		CLANG_TOOLSET = false;
-		INTEL_TOOLSET = true;
+		ICC_TOOLSET = true;
 	} else {
 		/* Visual Studio is the default toolset. */
 		PHP_TOOLSET = "no" == PHP_TOOLSET ? "vs" : PHP_TOOLSET;
 		if (!!PHP_TOOLSET && "vs" != PHP_TOOLSET) {
-			ERROR("Unsupported toolset name '" + PHP_TOOLSET + "'");
+			ERROR("Unsupported toolset '" + PHP_TOOLSET + "'");
 		}
 		VS_TOOLSET = true;
 		CLANG_TOOLSET = false;
-		INTEL_TOOLSET = false;
+		ICC_TOOLSET = false;
 	}
 }
 
@@ -2355,7 +2355,7 @@ function toolset_setup_compiler()
 		DEFINE("PHP_COMPILER_SHORT", "clang");
 		AC_DEFINE('PHP_COMPILER_ID', "clang"); /* XXX something better were to write here */
 
-	} else if (INTEL_TOOLSET) {
+	} else if (ICC_TOOLSET) {
 		INTELVERS = COMPILER_NUMERIC_VERSION;
 
 		AC_DEFINE('COMPILER', COMPILER_NAME, "Detected compiler version");
@@ -2415,7 +2415,7 @@ function toolset_get_compiler()
 		return PATH_PROG('cl', null, 'PHP_CL')
 	} else if (CLANG_TOOLSET) {
 		return PATH_PROG('clang-cl', null, 'PHP_CL')
-	} else if (INTEL_TOOLSET) {
+	} else if (ICC_TOOLSET) {
 		return PATH_PROG('icl', null, 'PHP_CL')
 	}
 
@@ -2441,7 +2441,7 @@ function toolset_get_compiler_version()
 
 			return version;
 		}
-	} else if (INTEL_TOOLSET) {
+	} else if (ICC_TOOLSET) {
 		var command = 'cmd /c ""' + PHP_CL + '" -v"';
 		var full = execute(command + '" 2>&1"');
 
@@ -2464,7 +2464,7 @@ function toolset_get_compiler_name()
 	if (VS_TOOLSET) {
 		version = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
 		return VC_VERSIONS[version];
-	} else if (CLANG_TOOLSET || INTEL_TOOLSET) {
+	} else if (CLANG_TOOLSET || ICC_TOOLSET) {
 		var command = 'cmd /c ""' + PHP_CL + '" -v"';
 		var full = execute(command + '" 2>&1"');
 
@@ -2489,7 +2489,7 @@ function toolset_is_64()
 		clang-cl doesn't recognize the arch toolset. But as it needs 
 		the VS environment, checking the arch of cl.exe is correct. */
 		return probe_binary(PATH_PROG('cl', null), 64);
-	} else if (INTEL_TOOLSET) {
+	} else if (ICC_TOOLSET) {
 		var command = 'cmd /c ""' + PHP_CL + '" -v"';
 		var full = execute(command + '" 2>&1"');
 
@@ -2507,7 +2507,7 @@ function toolset_setup_linker()
 	} else if (CLANG_TOOLSET) {
 		//return PATH_PROG('lld', WshShell.Environment("Process").Item("PATH"), "LINK");
 		return PATH_PROG('link', WshShell.Environment("Process").Item("PATH"));
-	} else if (INTEL_TOOLSET) {
+	} else if (ICC_TOOLSET) {
 		return PATH_PROG('xilink', WshShell.Environment("Process").Item("PATH"), "LINK");
 	}