diff --git a/deps/blas.mk b/deps/blas.mk
index 5fdf179af6794..6b70698c9e3c4 100644
--- a/deps/blas.mk
+++ b/deps/blas.mk
@@ -80,8 +80,8 @@ endif
 endif
 
 OPENBLAS_BUILD_OPTS += CFLAGS="$(CFLAGS) $(OPENBLAS_CFLAGS)"
-OPENBLAS_BUILD_OPTS += FFLAGS="$(FFLAGS) $(OPENBLAS_FFLAGS) -L$(CSL_SHLIBDIR)"
-OPENBLAS_BUILD_OPTS += LDFLAGS="$(LDFLAGS) $(RPATH_ESCAPED_ORIGIN) -L$(CSL_SHLIBDIR)"
+OPENBLAS_BUILD_OPTS += FFLAGS="$(FFLAGS) $(OPENBLAS_FFLAGS) -L$(CSL_SHLIBDIR) $(call rpath_link_flag,$(CSL_SHLIBDIR))"
+OPENBLAS_BUILD_OPTS += LDFLAGS="$(LDFLAGS) $(RPATH_ESCAPED_ORIGIN) -L$(CSL_SHLIBDIR) $(call rpath_link_flag,$(CSL_SHLIBDIR))"
 
 # Debug OpenBLAS
 ifeq ($(OPENBLAS_DEBUG), 1)
diff --git a/deps/csl.mk b/deps/csl.mk
index 5bd5248f85403..26268d7490a40 100644
--- a/deps/csl.mk
+++ b/deps/csl.mk
@@ -10,6 +10,7 @@ ifeq ($(OS),FreeBSD)
 UNINSTALL_compilersupportlibraries := delete-uninstaller $(build_shlibdir)/libgcc_s.so.1
 $(build_prefix)/manifest/compilersupportlibraries: | $(build_shlibdir) $(build_prefix)/manifest
 	@cp -v $$($(FC) --print-file-name=libgcc_s.so.1) $(build_shlibdir)
+	@ln -s libgcc_s.so.1 $(build_shlibdir)/libgcc_s.so
 	@echo "delete-uninstaller $(build_shlibdir)/libgcc_s.so.1" > "$@"
 else
 $(build_prefix)/manifest/compilersupportlibraries: