fix typo in update LIBLAPACK env var (fixes #165)

easybuilders · Aug 26, 2012 · 1128ade · 1128ade
1 parent db3fa87
commit 1128ade
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/easybuild/tools/toolkit.py b/easybuild/tools/toolkit.py
@@ -351,15 +351,15 @@ def prepareATLAS(self):
 
         atlas = get_software_root("ATLAS")
 
-        self.vars['LIBBLAS'] = ' '.join(["-l%s" % x for x in blas_libs] + ["-lgfortran"])
-        self.vars['LIBBLAS_MT'] = ' '.join(["-l%s" % x for x in blas_mt_libs] + ["-lgfortran", "-lpthread"])
+        self.vars['LIBBLAS'] = ' '.join(["-l%s" % x for x in blas_libs+["gfortran"]])
+        self.vars['LIBBLAS_MT'] = ' '.join(["-l%s" % x for x in blas_mt_libs+["gfortran", "pthread"]])
         self.vars['BLAS_LIB_DIR'] = os.path.join(atlas, "lib")
         self.vars['BLAS_STATIC_LIBS'] = ','.join(["lib%s.a" % x for x in blas_libs])
         self.vars['BLAS_MT_STATIC_LIBS'] = ','.join(["lib%s.a" % x for x in blas_mt_libs])
 
         if not self.vars.has_key('LIBLAPACK') and not self.vars.has_key('LIBLAPACK_MT'):
-            self.vars['LIBLAPACK'] = ' '.join(["lapack", self.vars['LIBBLAS']])
-            self.vars['LIBLAPACK_MT'] = ' '.join(["lapack", self.vars['LIBBLAS_MT']])
+            self.vars['LIBLAPACK'] = ' '.join(["-llapack", self.vars['LIBBLAS']])
+            self.vars['LIBLAPACK_MT'] = ' '.join(["-llapack", self.vars['LIBBLAS_MT']])
         self.vars['LAPACK_LIB_DIR'] = self.vars['BLAS_LIB_DIR']
         self.vars['LAPACK_STATIC_LIBS'] = "liblapack.a," + self.vars['BLAS_STATIC_LIBS']
         self.vars['LAPACK_MT_STATIC_LIBS'] = "liblapack.a," + self.vars['BLAS_MT_STATIC_LIBS']