From 8a8284dff37d1e1f910cb59283bfa33f3fdd209a Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 1 Oct 2004 10:41:53 +0000 Subject: [PATCH] Updated to handle Intel 8.1. Enable customisation of Intel compiler driver name. [SVN r25504] --- v1/intel-linux-tools.html | 160 +++++++++++++++++--------------------- v1/intel-linux-tools.jam | 15 ++-- 2 files changed, 83 insertions(+), 92 deletions(-) diff --git a/v1/intel-linux-tools.html b/v1/intel-linux-tools.html index d774e357c..f11a482cb 100644 --- a/v1/intel-linux-tools.html +++ b/v1/intel-linux-tools.html @@ -1,90 +1,76 @@ - - - - - - - Boost.Build - intel-linux toolset - - - - - - - - - -
-

-

- 		-

Boost.Build

- -

intel-linux toolset

-
-
- -

Introduction

- -

Boost.Build's intel-linux toolset supports the Intel - C++ Compiler for Linux.

- -

Configuration Variables

The intel-linux toolset responds to - the following variables which can be set in the environment or - configured on the jam command-line using - -sVARIABLE_NAME=value. If neither - variable is set but iccvars.sh can be found in the - PATH, then the version of the tools installed where - iccvars.sh lives is used. - - - - - - - - - - - - - - - - - - - - - - - - - -
Variable NameSemanticsDefaultNotes
INTEL_VERSIONThe version of the compiler to use.70If INTEL_PATH is set, this variable is ignored. - - -
INTEL_PATHThe path to the compiler installation.The default installation location for the version specified by -INTEL_VERSION - -
- -
- -

Revised - - 3 Jan, 2004

- -

Copyright © Dave Abrahams 2002-2003.

- -

Use, modification, and distribution are subject to the Boost - Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at www.boost.org/LICENSE_1_0.txt)

- + + Boost.Build - intel-linux toolset + + + + + + + + + + +
+

C++ Boost

+ 		+

Boost.Build

+

intel-linux toolset

+
+
+

Introduction

+

Boost.Build's intel-linux toolset supports the + Intel C++ Compiler for Linux.

+

Configuration Variables

+

+ The intel-linux toolset responds to the following variables which can be set in + the environment or configured on the jam command-line using -sVARIABLE_NAME=value. + If neither variable is set but iccvars.sh can be found in the PATH, + then the version of the tools installed where iccvars.sh lives is + used. +

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Variable NameSemanticsDefaultsNotes
INTEL_VERSIONThe version of the compiler to use.80If INTEL_PATH is set, this variable is ignored.
INTEL_PATHThe path to the compiler installation.The default installation location for the version specified by INTEL_VERSION.
INTEL_CCThe name of the C compiler.icc
INTEL_CXXThe name of the C++ compiler/linker.icpc
+

+
+

Revised + + 01 Oct, 2004

+

Copyright © Dave Abrahams 2002-2003.

+

Use, modification, and distribution are subject to the Boost Software + License, Version 1.0. (See accompanying file LICENSE_1_0.txt + or copy at www.boost.org/LICENSE_1_0.txt)

+ diff --git a/v1/intel-linux-tools.jam b/v1/intel-linux-tools.jam index ed4e5188a..cf4bf081a 100644 --- a/v1/intel-linux-tools.jam +++ b/v1/intel-linux-tools.jam @@ -14,6 +14,8 @@ set-as-singleton INTEL_PATH ; INTEL_VERSION ?= $(INTEL_LINUX_VERSION) ; # For backwards compatibility +INTEL_CC ?= icc ; +INTEL_CXX ?= icpc ; # Attempt to look in the PATH if no variables have been set up. if ! $(INTEL_VERSION) && ! $(INTEL_PATH) @@ -22,7 +24,7 @@ if ! $(INTEL_VERSION) && ! $(INTEL_PATH) INTEL_PATH ?= $(paths[0]) ; } -INTEL_VERSION ?= 70 ; +INTEL_VERSION ?= 80 ; # In case the path is unspecified, try to deduce it from the version if $(INTEL_VERSION) in 50 60 70 @@ -82,6 +84,7 @@ flags intel-linux LINKFLAGS static : -static ; # required libraries flags intel-linux FINDLIBS : rt ; +flags intel-linux FINDLIBS static : pthread ; #### standard settings #### @@ -97,7 +100,7 @@ flags intel-linux LIBPATH ; flags intel-linux NEEDLIBS ; flags intel-linux FINDLIBS ; -flags intel-linux SYSHDRS ; +flags intel-linux STDHDRS ; flags intel-linux LINKFLAGS ; flags intel-linux ARFLAGS ; @@ -123,7 +126,7 @@ rule Cc-action actions intel-linux-Cc-action { $(INTEL_LINUX_SETUP) - icc -c -w1 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -I"$(SYSHDRS)" -o "$(<)" "$(>)" + $(INTEL_CC) -c -w1 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" } #### C++ #### @@ -136,7 +139,7 @@ rule C++-action actions intel-linux-C++-action { $(INTEL_LINUX_SETUP) - icc -c -w1 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -I"$(SYSHDRS)" -o "$(<)" "$(>)" + $(INTEL_CXX) -c -w1 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)" } #### Archive #### @@ -179,7 +182,9 @@ rule Link-action actions intel-linux-Link-action bind NEEDLIBS NEEDIMPS { $(INTEL_LINUX_SETUP) - icc $(LINKFLAGS) -o "$(<[1])$(OUTTAG)" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" $(NEEDLIBS) $(NEEDLIBS) -l$(FINDLIBS) "$(IMPLIB_FLAGS)$(NEEDIMPS)" "-Qoption,link,-soname,$(<[1]:D=)$(SOTAG)" + $(INTEL_CXX) $(LINKFLAGS) -o "$(<[1])$(OUTTAG)" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" $(NEEDLIBS) $(NEEDLIBS) -l$(FINDLIBS) "$(IMPLIB_FLAGS)$(NEEDIMPS)" "-Qoption,link,-soname,$(<[1]:D=)$(SOTAG)" $(ACTION_1)$(LN)$(SPACE)-fs$(SPACE)"$(<[1]:D=)$(OUTTAG)"$(SPACE)"$(<[1])" } + +