summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xcompiler/extccomp.nim12
-rwxr-xr-xconfig/nimrod.cfg6
2 files changed, 10 insertions, 8 deletions
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index 2872f28a7..15061faae 100755
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -16,7 +16,7 @@ import
 type 
   TSystemCC* = enum 
     ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc, 
-    ccTcc, ccPcc, ccUcc, ccIcc, ccGpp
+    ccTcc, ccPcc, ccUcc, ccIcl, ccGpp
   TInfoCCProp* = enum         # properties of the C compiler:
     hasSwitchRange,           # CC allows ranges in switch statements (GNU C)
     hasComputedGoto,          # CC has computed goto (GNU C extension)
@@ -121,16 +121,16 @@ compiler vcc:
     asmStmtFrmt: "__asm{$n$1$n}$n",
     props: {hasCpp, hasAssume})
 
-compiler icc:
+compiler icl:
   # Intel compilers try to imitate the native ones (gcc and msvc)
   when defined(windows):
     result = vcc()
   else:
     result = gcc()
 
-  result.name = "icc"
-  result.compilerExe = "icc"
-  result.linkerExe = "icc"
+  result.name = "icl"
+  result.compilerExe = "icl"
+  result.linkerExe = "icl"
 
 compiler lcc:
   result = (
@@ -293,7 +293,7 @@ const
     tcc(),
     pcc(),
     ucc(),
-    icc(),
+    icl(),
     gpp()]
 
 const
diff --git a/config/nimrod.cfg b/config/nimrod.cfg
index fdab40c6c..deb996ca2 100755
--- a/config/nimrod.cfg
+++ b/config/nimrod.cfg
@@ -74,8 +74,10 @@ hint[LineTooLong]=off
 @end
 
 # Configuration for the Intel C/C++ compiler:
-icc.options.always = "-cxxlib"
-icc.options.linker = "-cxxlib"
+@if windows:
+  icl.options.speed = "/Ox /arch:SSE2"
+  icl.options.always = "/nologo"
+@end
 
 # Configuration for the GNU C/C++ compiler:
 @if windows: