From 6a52c4ee9d2ee8b5723fc9fac4ebc97b77357613 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 16 Jun 2020 21:45:04 +0100 Subject: XLSX I/O properly accounts for local build Until now, when adding the necessary library flags to the build of XLSX I/O, we were effectively over-writing the 'LDFLAGS' variables. So the compiler was effectively not being told where to look for the necessary libraries. With this commit, to fix the problem, we now append the new linking flags to LDFLAGS in XLSX I/O's build, not over-write it. --- reproduce/software/make/high-level.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'reproduce/software') diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 7cc2d51..75fa8ac 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -1224,9 +1224,9 @@ $(ibidir)/xlsxio: $(ibidir)/cmake \ if [ x$(on_mac_os) = xyes ]; then \ export CC=clang; \ export CXX=clang++; \ - export LDFLAGS="-lbz2"; \ + export LDFLAGS="$$LDFLAGS -lbz2"; \ else \ - export LDFLAGS="-lbz2 -lbsd"; \ + export LDFLAGS="$$LDFLAGS -lbz2 -lbsd"; \ fi; \ $(call cbuild, xlsxio-$(xlsxio-version), static, \ -DMINIZIP_DIR:PATH=$(idir) \ -- cgit v1.2.1