From abff0f0c44e58d3314abaae0323975081753042d Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Thu, 26 Mar 2015 02:16:12 +0100 Subject: [PATCH] Fixed static build with gfortran --- scripts/make_binary.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/make_binary.sh b/scripts/make_binary.sh index 8ac6495d..832be596 100755 --- a/scripts/make_binary.sh +++ b/scripts/make_binary.sh @@ -123,8 +123,12 @@ echo "Copying dynamic libraries" # -------------------------- MKL_LIBS=$(find_libs ${FORTRAN_EXEC} | grep libmkl | head -1) -MKL_LIBS=$(dirname ${MKL_LIBS}) -MKL_LIBS=$(ls ${MKL_LIBS}/libmkl_{def,avx,avx2}.so) +if [[ -n ${MKL_LIBS} ]] +then + MKL_LIBS=$(dirname ${MKL_LIBS}) + MKL_LIBS=$(ls ${MKL_LIBS}/libmkl_{def,avx,avx2}.so) +fi + ALL_LIBS=$(find_libs ${OCAML_EXEC} ${FORTRAN_EXEC}) cp -- ${ALL_LIBS} ${MKL_LIBS} ${QPACKAGE_STATIC}/extra_lib if [[ $? -ne 0 ]] ; @@ -133,12 +137,7 @@ then exit 1 fi -cp -- ${QPACKAGE_STATIC}/extra_lib/{libiomp*,libmkl*} ${QPACKAGE_STATIC}/lib/ -if [[ $? -ne 0 ]] ; -then - echo 'mv -- ${QPACKAGE_STATIC}/extra_lib/{libiomp*,libmkl*} ${QPACKAGE_STATIC}/lib/' - exit 1 -fi +cp -- ${QPACKAGE_STATIC}/extra_lib/lib{[gi]omp*,mkl*,lapack*,blas*,z*} ${QPACKAGE_STATIC}/lib/ # echo "Copying EMSL_Basis directory"