# HG changeset patch # User huston@80426f53-59d1-405d-934b-f07cd76f4a1a # Date 1265232388 0 # Node ID a93f5d5278f35f22c93452c9dab8a2737bb9f441 # Parent ca6c77fe843bcf52453bde03a14e773836012376 Fixed for Intel compilers 11.0 diff -r ca6c77fe843b -r a93f5d5278f3 .bashrc --- 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