From 924288564990381f3931c70b57f3dc18a96b8332 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 10 Jan 2024 20:23:28 +0100
Subject: [PATCH] Fix most pressing regressions in Makevars

---
 src/Makevars.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Makevars.in b/src/Makevars.in
index ac7edc792c4..11db2342e9a 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,15 +1,15 @@
 include sources.mk
 
-LIB_XML ?= $(MINGW_PREFIX)
-GLPK_HOME ?= $(MINGW_PREFIX)
-LIB_GMP ?= $(MINGW_PREFIX)
+PKG_CFLAGS=$(C_VISIBILITY)
+PKG_CXXFLAGS=$(CXX_VISIBILITY)
+PKG_FFLAGS=$(F_VISIBILITY)
 
 PKG_CPPFLAGS=@cflags@ -DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor \
 	-DNDEBUG -DNTIMER -DNPRINT -DINTERNAL_ARPACK -DIGRAPH_THREAD_LOCAL= \
 	-DPRPACK_IGRAPH_SUPPORT \
 	-D_GNU_SOURCE=1
 
-PKG_LIBS = -L"${LIB_XML}/lib" -lxml2 -lz -lstdc++ -L"${GLPK_HOME}/lib" \
-  -lglpk -lgmp -L"${LIB_GMP}/lib" "${BLAS_LIBS}" "${LAPACK_LIBS}"
+PKG_LIBS = -L"${LIB_XML}/lib" -lxml2 -lz -L"${GLPK_HOME}/lib" \
+  -lglpk -lgmp -L"${LIB_GMP}/lib" $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 
 OBJECTS=${SOURCES}