Update section on icc from PR 38398. This update is probably itself

substantially out of date, but it's what we've got...

1 files changed, 14 insertions, 23 deletions

diff --git a/doc/guide/files/platforms.xml b/doc/guide/files/platforms.xml
index 378fb6a4382..3d7d56e04fe 100644
--- a/doc/guide/files/platforms.xml
+++ b/doc/guide/files/platforms.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: platforms.xml,v 1.70 2012/05/04 13:57:53 obache Exp $ -->
+<!-- $NetBSD: platforms.xml,v 1.71 2012/05/13 05:36:28 dholland Exp $ -->
 
 <chapter id="platforms">
   <title>Using pkgsrc on systems other than &os;</title>
@@ -369,37 +369,28 @@ PKGSRC_COMPILER=        mipspro
       directory:</para>
 
       <programlisting>
-env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
-ac_cv___attribute__=yes ./bootstrap
+env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
       </programlisting>
 
       <note>
-	<para>icc 8.1 needs the `-i-static' argument instead of -static-libcxa.</para>
+	<para>For icc 8.0 you must add `LDFLAGS=-static-libcxa' to this.</para>
+	<para>For icc 8.1 you must add `LDFLAGS=-i-static' instead.</para>
+	<para>For icc 10.1 neither of these appears to be necessary.</para>
       </note>
 
-      <para>icc supports __attribute__, but the GNU configure test uses a nested
-      function, which icc does not support. #undef'ing __attribute__ has the
-      unfortunate side-effect of breaking many of the Linux header files, which
-      cannot be compiled properly without __attribute__. The test must be
-      overridden so that __attribute__ is assumed supported by the
-      compiler.</para>
-
-      <para>After bootstrapping, you should set <varname>PKGSRC_COMPILER</varname>
-      in &mk.conf;:</para>
+      <para>Use a value for ICCBASE that corresponds to the directory
+      where icc is installed. After bootstrapping, set
+      <varname>ICCBASE</varname> in &mk.conf;:</para>
 
       <programlisting>
-PKGSRC_COMPILER=        icc
+ICCBASE=                /opt/intel/cc/10.1.008
       </programlisting>
 
-      <para>The default installation directory for icc is
-      <filename>/opt/intel_cc_80</filename>, which
-      is also the pkgsrc default. If you have installed it into a different
-      directory, set <varname>ICCBASE</varname> in
-      &mk.conf;:</para>
-
-      <programlisting>
-ICCBASE=                /opt/icc
-      </programlisting>
+      <para>The pkgsrc default for <varname>ICCBASE</varname> is
+      <filename>/opt/intel_cc_80</filename>. This is the default
+      install directory for icc 8.0. If you are using a more recent
+      version, be sure to set the correct path explicitly.
+      </para>
 
       <para>pkgsrc uses the static linking method of the runtime libraries
       provided by icc, so binaries can be run on other systems which do not