Skip to content

Commit

Permalink
Toolchain: Stop linking libgslcblas
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Mar 24, 2022
1 parent ddacd51 commit 479c46c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
4 changes: 1 addition & 3 deletions tools/toolchain/scripts/stage6/install_gsl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ case "$with_gsl" in
;;
esac
if [ "$with_gsl" != "__DONTUSE__" ]; then
GSL_LIBS="-lgsl -lgslcblas"
GSL_LIBS="-lgsl"
if [ "$with_gsl" != "__SYSTEM__" ]; then
cat << EOF > "${BUILDDIR}/setup_gsl"
prepend_path LD_LIBRARY_PATH "$pkg_install_dir/lib"
Expand All @@ -82,7 +82,6 @@ prepend_path LIBRARY_PATH "$pkg_install_dir/lib"
prepend_path CPATH "$pkg_install_dir/include"
export GSL_INCLUDE_DIR="$pkg_install_dir/include"
export GSL_LIBRARY="-lgsl"
export GSL_CBLAS_LIBRARY="-lgslcblas"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$pkg_install_dir/lib64/pkgconfig:$pkg_install_dir/lib/pkgconfig"
EOF
fi
Expand All @@ -94,7 +93,6 @@ export CP_CFLAGS="\${CP_CFLAGS} ${GSL_CFLAGS}"
export CP_LDFLAGS="\${CP_LDFLAGS} ${GSL_LDFLAGS}"
export GSL_LIBRARY="-lgsl"
export GSL_ROOT="$pkg_install_dir"
export GSL_CBLAS_LIBRARY="-lgslcblas"
export GSL_INCLUDE_DIR="$pkg_install_dir/include"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$pkg_install_dir/lib64/pkgconfig:$pkg_install_dir/lib/pkgconfig"
Expand Down
1 change: 0 additions & 1 deletion tools/toolchain/scripts/stage8/install_sirius.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ case "$with_sirius" in
require_env GSL_LIBS
require_env GSL_INCLUDE_DIR
require_env GSL_LIBRARY
require_env GSL_CBLAS_LIBRARY
require_env MATH_LIBS
require_env MPI_LDFLAGS
require_env MPI_LIBS
Expand Down

0 comments on commit 479c46c

Please sign in to comment.