Mercurial > index.cgi > dotfiles

changeset 31:a93f5d5278f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed for Intel compilers 11.0
author huston@80426f53-59d1-405d-934b-f07cd76f4a1a
date Wed, 03 Feb 2010 21:26:28 +0000
parents ca6c77fe843b
children 29dfb30b069c
files .bashrc
diffstat 1 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.bashrc	Mon Feb 01 19:33:19 2010 +0000
+++ b/.bashrc	Wed Feb 03 21:26:28 2010 +0000
@@ -92,10 +92,23 @@
 done
 
 # Add-ons for Intel compilers at work, and Condor
-[[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
-  . /usr/peyton/intel/11.0/bin/iccvars.sh
-[[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
-  . /usr/peyton/intel/11.0/bin/ifortvars.sh
+INTEL_ARCH=''
+case `uname -p` in
+  i[3456]86)
+    INTEL_ARCH="ia32"
+    ;;
+
+  x86_64)
+    INTEL_ARCH="intel64"
+    ;;
+esac
+[[ "$INTEL_ARCH" ]] && {
+  [[ -f /usr/peyton/intel/11.0/bin/iccvars.sh ]] && \
+    . /usr/peyton/intel/11.0/bin/iccvars.sh $INTEL_ARCH
+  [[ -f /usr/peyton/intel/11.0/bin/ifortvars.sh ]] && \
+    . /usr/peyton/intel/11.0/bin/ifortvars.sh $INTEL_ARCH
+}
+
 [[ -f /u/condor/condor-setup.sh ]] && {
   export PATH=${PATH:+$PATH:}/u/condor/hosts/`hostname -s`/sbin
   . /u/condor/condor-setup.sh