diff --git a/bin/qp_export_as_tgz b/bin/qp_export_as_tgz index 64f03713..d9cded83 100755 --- a/bin/qp_export_as_tgz +++ b/bin/qp_export_as_tgz @@ -174,14 +174,10 @@ for i in ${ALL_LIBS} ${MKL_LIBS} ; do cp -- ${i} ${QPACKAGE_STATIC}/extra_lib done -rm -rf extra_lib/{libc.so*,libpthread.so*,librt.so*,libm.so*,libdl.so*,libgcc_s.so*} - if [[ $? -ne 0 ]] ; then - echo 'cp -- ${ALL_LIBS} ${MKL_LIBS} ${QPACKAGE_STATIC}/extra_lib' - exit 1 fi -cp -- ${QPACKAGE_STATIC}/extra_lib/lib{[gi]omp*,mkl*,lapack*,blas*,z*} \ +cp -- ${QPACKAGE_STATIC}/extra_lib/lib{[gi]omp*,mkl*,lapack*,blas*,z*,gfortran*,quad*} \ ${QPACKAGE_STATIC}/lib/ # diff --git a/etc/paths.rc b/etc/paths.rc index 7f7e1a97..ce82358a 100644 --- a/etc/paths.rc +++ b/etc/paths.rc @@ -32,7 +32,7 @@ export PYTHONPATH=$(qp_prepend_export "PYTHONPATH" "${QP_EZFIO}/Python":"${QP_PY export PATH=$(qp_prepend_export "PATH" "${QP_PYTHON}":"${QP_ROOT}"/bin:"${QP_ROOT}"/ocaml) -export LD_LIBRARY_PATH=$(qp_prepend_export "LD_LIBRARY_PATH" "${QP_ROOT}"/lib)":${QP_ROOT}"/extra_lib +export LD_LIBRARY_PATH=$(qp_prepend_export "LD_LIBRARY_PATH" "${QP_ROOT}"/lib) export LIBRARY_PATH=$(qp_prepend_export "LIBRARY_PATH" "${QP_ROOT}"/lib:"${QP_ROOT}"/lib64)