8 files changed, 31 insertions, 19 deletions
diff --git a/build-0.3/cxx/intel/configuration-rules.make b/build-0.3/cxx/intel/configuration-rules.make
index 577f2f7..873e08e 100644
--- a/build-0.3/cxx/intel/configuration-rules.make
+++ b/build-0.3/cxx/intel/configuration-rules.make
@@ -1,14 +1,14 @@
 # file      : build/cxx/intel/configuration-rules.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(dcf_root)/cxx/intel/configuration-dynamic.make: | $(dcf_root)/cxx/intel/.
-	$(call message,,$(bld_root)/cxx/intel/configure $@ $(cxx_optimize))
+	$(call message,,$(bld_root)/cxx/intel/configure $@ $(cxx_optimize) \
+"$(cxx_extra_options)" "$(cxx_ld_extra_options)")
 
 ifndef %foreign%
 
-disfigure::
+$(dcf_root)/.disfigure::
 	$(call message,rm $(dcf_root)/cxx/intel/configuration-dynamic.make,\
 rm -f $(dcf_root)/cxx/intel/configuration-dynamic.make)
 
diff --git a/build-0.3/cxx/intel/configuration-static.make b/build-0.3/cxx/intel/configuration-static.make
index e619365..1db64f0 100644
--- a/build-0.3/cxx/intel/configuration-static.make
+++ b/build-0.3/cxx/intel/configuration-static.make
@@ -1,4 +1,3 @@
 # file      : build/cxx/intel/configuration-static.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
diff --git a/build-0.3/cxx/intel/configuration.make b/build-0.3/cxx/intel/configuration.make
index eade065..c6e6867 100644
--- a/build-0.3/cxx/intel/configuration.make
+++ b/build-0.3/cxx/intel/configuration.make
@@ -1,6 +1,5 @@
 # file      : build/cxx/intel/configuration.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include-once,$(bld_root)/cxx/intel/configuration-rules.make,$(dcf_root))
diff --git a/build-0.3/cxx/intel/configure b/build-0.3/cxx/intel/configure
index ef250cf..7f79dd8 100755
--- a/build-0.3/cxx/intel/configure
+++ b/build-0.3/cxx/intel/configure
@@ -1,12 +1,13 @@
 #! /usr/bin/env bash
 
 # file      : build/cxx/intel/configure
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 # $1  out file
 # $2  optimize (y/n)
+# $3  cxx_extra_options
+# $4  cxx_ld_extra_options
 #
 # bld_root     - build root
 # project_name - project name
@@ -27,7 +28,24 @@ $echo "'/opt/intel_cc_80/bin/icpc'."
 $echo
 
 cxx_intel=`read_path --command icpc`
-cxx_intel_libraries=`$cxx_intel -print-search-dirs | sed -e 's/libraries: =//p' -e d`
+
+# Determine the C++ standard. Intel C++ on GNU/Linux appears to use the
+# same option and values as GCC.
+#
+cxx_intel_standard=`echo "$3" | sed -e 's/.*-std=\([^ ]*\).*/\1/' -e t -e d`
+
+if [ -z "$cxx_intel_standard" ]; then
+  cxx_intel_standard="gnu++98"
+elif [ "$cxx_intel_standard" = "c++0x" ]; then
+  cxx_intel_standard="c++11"
+elif [ "$cxx_intel_standard" = "gnu++0x" ]; then
+  cxx_intel_standard="gnu++11"
+fi
+
+# Pass cxx_extra_options and cxx_ld_extra_options since those
+# can affect the search paths (e.g., -m32).
+#
+cxx_intel_libraries=`$cxx_intel $3 $4 -print-search-dirs | sed -e 's/libraries: =//p' -e d`
 
 # Intel optimizes by default.
 #
diff --git a/build-0.3/cxx/intel/cxx-d.make b/build-0.3/cxx/intel/cxx-d.make
index cd7b567..7c4bba2 100644
--- a/build-0.3/cxx/intel/cxx-d.make
+++ b/build-0.3/cxx/intel/cxx-d.make
@@ -1,6 +1,5 @@
 # file      : build/cxx/intel/cxx-o.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include-once,$(bld_root)/c/cpp-options.make,$(out_base))
diff --git a/build-0.3/cxx/intel/cxx-o.make b/build-0.3/cxx/intel/cxx-o.make
index c64e2c8..db34a85 100644
--- a/build-0.3/cxx/intel/cxx-o.make
+++ b/build-0.3/cxx/intel/cxx-o.make
@@ -1,6 +1,5 @@
 # file      : build/cxx/intel/cxx-o.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include-once,$(bld_root)/c/cpp-options.make,$(out_base))
diff --git a/build-0.3/cxx/intel/o-e.make b/build-0.3/cxx/intel/o-e.make
index c92173a..5c11854 100644
--- a/build-0.3/cxx/intel/o-e.make
+++ b/build-0.3/cxx/intel/o-e.make
@@ -1,6 +1,5 @@
 # file      : build/cxx/intel/o-e.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include,$(bld_root)/cxx/intel/configuration.make)
diff --git a/build-0.3/cxx/intel/o-l.make b/build-0.3/cxx/intel/o-l.make
index 76f8cff..0123687 100644
--- a/build-0.3/cxx/intel/o-l.make
+++ b/build-0.3/cxx/intel/o-l.make
@@ -1,6 +1,5 @@
 # file      : build/cxx/intel/o-l.make
-# author    : Boris Kolpackov <boris@codesynthesis.com>
-# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC
+# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(call include,$(bld_root)/cxx/intel/configuration.make)