Re: intel-linux toolset?

From: David Abrahams (dave_at_[hidden])
Date: 2004-01-03 10:48:04

> David Abrahams wrote:
>
>> What do you think of the enclosed patch?
>
> That would break intel-7. We need a switch
> on $(INTEL_LINUX_VERSION). The patch looks
> good for intel-8.

OK, how about this one? It would make the configuration for
intel-linux and intel-win32 more consistent.

 --=-=-= Content-Type: text/x-patch
Content-Disposition: attachment; filename=intel-linux.patch

Index: intel-linux-tools.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v1/intel-linux-tools.jam,v
retrieving revision 1.21
diff -w -u -w -u -r1.21 intel-linux-tools.jam
--- intel-linux-tools.jam	15 Dec 2003 03:41:52 -0000	1.21
+++ intel-linux-tools.jam	3 Jan 2004 15:39:35 -0000
@@ -11,21 +11,31 @@
# number.
#//Intel
C++

-# Intel root directory set?
-if ! $(IA32ROOT)
+# this is the shell variable which is typically set to point to the intel installation
+INTEL_PATH ?= $(IA32ROOT) ;
+
+set-as-singleton INTEL_PATH ;
+
+# In case the version is unspecified, try to extract it from the path
+INTEL_VERSION ?= [ MATCH .*[^0-9]([0-9]+)/?$ : $(INTEL_PATH) ] ;
+INTEL_VERSION ?= 70 ;
+
+# In case the path is unspecified, try to deduce it from the version
+if $(INTEL_VERSION) in 50 60 70
{
- # Compiler version
- INTEL_LINUX_VERSION ?= "60" ;
+ INTEL_PATH ?= /opt/intel/ia32/compiler$(INTEL_VERSION) ;
+}
+else
+{
+ INTEL_PATH ?= /opt/intel_cc_$(INTEL_VERSION) ;
}
-
-flags intel-linux INTEL_LINUX_VERSION : $(INTEL_LINUX_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 ####

 --=-=-= 

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com
 --=-=-=--