From dc62e900fb739b41b0f5e5ea028dadb0b86e72a7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 15 Nov 2011 17:54:03 +0200
Subject: Pass extra options when extracting Intel C compiler library search
 paths

---
 build/c/intel/configuration-rules.make | 3 ++-
 build/c/intel/configure                | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/c/intel/configuration-rules.make b/build/c/intel/configuration-rules.make
index 097fc54..ff95fab 100644
--- a/build/c/intel/configuration-rules.make
+++ b/build/c/intel/configuration-rules.make
@@ -4,7 +4,8 @@
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 $(dcf_root)/c/intel/configuration-dynamic.make: | $(dcf_root)/c/intel/.
-	$(call message,,$(bld_root)/c/intel/configure $@ $(c_optimize))
+	$(call message,,$(bld_root)/c/intel/configure $@ $(c_optimize) \
+"$(c_extra_options)" "$(c_ld_extra_options)")
 
 ifndef %foreign%
 
diff --git a/build/c/intel/configure b/build/c/intel/configure
index ad11890..6da0f3b 100755
--- a/build/c/intel/configure
+++ b/build/c/intel/configure
@@ -7,6 +7,8 @@
 
 # $1  out file
 # $2  optimize (y/n)
+# $3  c_extra_options
+# $4  c_ld_extra_options
 #
 # bld_root     - build root
 # project_name - project name
@@ -27,7 +29,11 @@ $echo "'/opt/intel_cc_80/bin/icc'."
 $echo
 
 c_intel=`read_path --command icc`
-c_intel_libraries=`$c_intel -print-search-dirs | sed -e 's/libraries: =//p' -e d`
+
+# Pass c_extra_options and c_ld_extra_options since those can affect the
+# search paths (e.g., -m32) and target.
+#
+c_intel_libraries=`$c_intel $3 $4 -print-search-dirs | sed -e 's/libraries: =//p' -e d`
 
 # Intel optimizes by default.
 #
-- 
cgit v1.1