summaryrefslogtreecommitdiff
path: root/build-0.3/c/intel
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:25:44 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:25:44 +0200
commit8286ac511144e4f17d34eac9affb97e50646344a (patch)
treef1af7320d7b6be6be059216d0ad08ac7b4f73fd0 /build-0.3/c/intel
parenta15cf65c44d5c224169c32ef5495b68c758134b7 (diff)
Imported Upstream version 4.0.0upstream/4.0.0
Diffstat (limited to 'build-0.3/c/intel')
-rw-r--r--build-0.3/c/intel/c-d.make3
-rw-r--r--build-0.3/c/intel/c-o.make3
-rw-r--r--build-0.3/c/intel/configuration-rules.make8
-rw-r--r--build-0.3/c/intel/configuration-static.make3
-rw-r--r--build-0.3/c/intel/configuration.make3
-rwxr-xr-xbuild-0.3/c/intel/configure11
-rwxr-xr-xbuild-0.3/c/intel/dep3
-rw-r--r--build-0.3/c/intel/o-e.make3
-rw-r--r--build-0.3/c/intel/o-l.make3
9 files changed, 19 insertions, 21 deletions
diff --git a/build-0.3/c/intel/c-d.make b/build-0.3/c/intel/c-d.make
index aa6a559..b4d6c80 100644
--- a/build-0.3/c/intel/c-d.make
+++ b/build-0.3/c/intel/c-d.make
@@ -1,6 +1,5 @@
# file : build/c/intel/c-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/c/intel/c-o.make b/build-0.3/c/intel/c-o.make
index 3e359aa..e925b50 100644
--- a/build-0.3/c/intel/c-o.make
+++ b/build-0.3/c/intel/c-o.make
@@ -1,6 +1,5 @@
# file : build/c/intel/c-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/c/intel/configuration-rules.make b/build-0.3/c/intel/configuration-rules.make
index e464e00..0132981 100644
--- a/build-0.3/c/intel/configuration-rules.make
+++ b/build-0.3/c/intel/configuration-rules.make
@@ -1,14 +1,14 @@
# file : build/c/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)/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%
-disfigure::
+$(dcf_root)/.disfigure::
$(call message,rm $(dcf_root)/c/intel/configuration-dynamic.make,\
rm -f $(dcf_root)/c/intel/configuration-dynamic.make)
diff --git a/build-0.3/c/intel/configuration-static.make b/build-0.3/c/intel/configuration-static.make
index 29f44b1..c3e2d05 100644
--- a/build-0.3/c/intel/configuration-static.make
+++ b/build-0.3/c/intel/configuration-static.make
@@ -1,4 +1,3 @@
# file : build/c/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/c/intel/configuration.make b/build-0.3/c/intel/configuration.make
index 5e3e38f..4e0ec1e 100644
--- a/build-0.3/c/intel/configuration.make
+++ b/build-0.3/c/intel/configuration.make
@@ -1,6 +1,5 @@
# file : build/c/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)/c/intel/configuration-rules.make,$(dcf_root))
diff --git a/build-0.3/c/intel/configure b/build-0.3/c/intel/configure
index 0d1382d..e829cea 100755
--- a/build-0.3/c/intel/configure
+++ b/build-0.3/c/intel/configure
@@ -1,12 +1,13 @@
#! /usr/bin/env bash
# file : build/c/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 c_extra_options
+# $4 c_ld_extra_options
#
# bld_root - build root
# project_name - project name
@@ -27,7 +28,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.
#
diff --git a/build-0.3/c/intel/dep b/build-0.3/c/intel/dep
index 70f3b79..ead761f 100755
--- a/build-0.3/c/intel/dep
+++ b/build-0.3/c/intel/dep
@@ -1,8 +1,7 @@
#! /usr/bin/env bash
# file : build/c/intel/dep
-# 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
# Post-process generated dependency information.
diff --git a/build-0.3/c/intel/o-e.make b/build-0.3/c/intel/o-e.make
index 7442637..0661ccc 100644
--- a/build-0.3/c/intel/o-e.make
+++ b/build-0.3/c/intel/o-e.make
@@ -1,6 +1,5 @@
# file : build/c/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)/c/intel/configuration.make)
diff --git a/build-0.3/c/intel/o-l.make b/build-0.3/c/intel/o-l.make
index 818a4ca..0ad3085 100644
--- a/build-0.3/c/intel/o-l.make
+++ b/build-0.3/c/intel/o-l.make
@@ -1,6 +1,5 @@
# file : build/c/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)/c/intel/configuration.make)