boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

work with icc 8.0 and handle the no-configuration case

Browse Source 
[SVN r21459]
This commit is contained in:
Dave Abrahams
2004-01-03 20:05:59 +00:00
parent 1ddc593144
commit 72855a4c61
2 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
v1/intel-linux-tools.html
View File

@@ -30,14 +30,17 @@
<h2>Introduction</h2>
<p>Boost.Build's <a href=
"http://www.intel.com/software/products/compilers/c60l/">intel-linux</a>
toolset supports the Intel C++ Compiler for Linux.</p>
<p>Boost.Build's intel-linux toolset supports the <a
href="http://www.intel.com/software/products/compilers/clin/index.htm">Intel
C++ Compiler for Linux</a>.</p>
<h2>Configuration Variables</h2>The intel-linux toolset responds to the
following variables which can be set in the environment or configured on
the jam command-line using
<code>-s<i>VARIABLE_NAME</i>=</code><i>value</i>:
<h2>Configuration Variables</h2>The intel-linux toolset responds to
the following variables which can be set in the environment or
configured on the jam command-line using
<code>-s<i>VARIABLE_NAME</i>=</code><i>value</i>. If neither
variable is set but <code>iccvars.sh</code> can be found in the
<code>PATH</code>, then the version of the tools installed where
<code>iccvars.sh</code> lives is used.
<table border="1" summary="settings">
<tr>
@@ -51,28 +54,33 @@
</tr>
<tr>
<td><code>INTEL_LINUX_VERSION</code></td>
<td><code>INTEL_VERSION</code></td>
<td>The version of the compiler to use.</td>
<td><code>"60"</code></td>
<td><code>70</code></td>
<td>If <code>INTEL_PATH</code> is set, this variable is ignored.
<tr>
<td><code>INTEL_PATH</code></td>
<td>The path to the compiler installation.</td>
<td>The default installation location for the version specified by
<code>INTEL_VERSION</code>
<td>This is used to locate the setup script for the compiler. The
script used is
<code>/opt/intel/compiler$(INTEL_LINUX_VERSION)/ia32/bin/iccvars.sh</code>.
This variable is only used if and only if the setup script has not been
previously loaded. This is to allow for installations where the setup
is already done. In which case the script is not executed before the
invocation of the tools.</td>
</tr>
</table>
<hr>
<p>Revised
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
14 May, 2002 <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
3 Jan, 2004 <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
<p>Copyright &copy; Dave Abrahams 2002.</p>
<p>Copyright &copy; Dave Abrahams 2002-2003.</p>
<p><small>Use, modification, and distribution are subject to the Boost
Software License, Version 1.0. (See accompanying file <a href=

30
v1/intel-linux-tools.jam
View File

@@ -11,21 +11,35 @@
# number.
#//<a href="http://www.intel.com/software/products/compilers/">Intel<br>C++</a>
# Intel root directory set?
if ! $(IA32ROOT)
set-as-singleton INTEL_PATH ;
INTEL_VERSION ?= $(INTEL_LINUX_VERSION) ; # For backwards compatibility
# Attempt to look in the PATH if no variables have been set up.
if ! $(INTEL_VERSION) && ! $(INTEL_PATH)
{
# Compiler version
INTEL_LINUX_VERSION ?= "60" ;
local paths = [ MATCH ^(.*/(compiler[567]0/ia32|intel_cc_[0-9]+))/ : [ GLOB $(PATH) : iccvars.sh ] ] ;
INTEL_PATH ?= $(paths[0]) ;
}
flags intel-linux INTEL_LINUX_VERSION : $(INTEL_LINUX_VERSION) ;
INTEL_VERSION ?= 70 ;
# In case the path is unspecified, try to deduce it from the version
if $(INTEL_VERSION) in 50 60 70
{
INTEL_PATH ?= /opt/intel/compiler$(INTEL_VERSION)/ia32 ;
}
else
{
INTEL_PATH ?= /opt/intel_cc_$(INTEL_VERSION) ;
}
# Root directory
flags intel-linux INTEL_LINUX_ROOT : "/opt/intel/compiler"$(INTEL_LINUX_VERSION) ;
flags intel-linux INTEL_LINUX_ROOT : $(INTEL_PATH) ;
# Setup script
flags intel-linux INTEL_LINUX_SETUP : ". "$(INTEL_LINUX_ROOT)"/ia32/bin/iccvars.sh" ;
flags intel-linux INTEL_LINUX_SETUP : ". "$(INTEL_LINUX_ROOT)"/bin/iccvars.sh" ;
# Additional DLL directory
flags intel-linux INTEL_LINUX_RUN_LD_LIBRARY_PATH : $(INTEL_LINUX_ROOT)"/ia32/lib" ;
flags intel-linux INTEL_LINUX_RUN_LD_LIBRARY_PATH : $(INTEL_LINUX_ROOT)"/lib" ;
#### compiler and linker switches ####