aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-16 21:45:04 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-16 21:45:04 +0100
commit6a52c4ee9d2ee8b5723fc9fac4ebc97b77357613 (patch)
tree4c99ef979278105f9ba3dddf457b61a08ce8d53d /reproduce/software
parent0b49fb07ec3363495868cb5012b4ab74c2e7f2b7 (diff)
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.
Diffstat (limited to 'reproduce/software')
-rw-r--r--reproduce/software/make/high-level.mk4
1 files changed, 2 insertions, 2 deletions
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) \