aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/make
diff options
context:
space:
mode:
Diffstat (limited to 'reproduce/software/make')
-rw-r--r--reproduce/software/make/basic.mk2
-rw-r--r--reproduce/software/make/high-level.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index b4745e2..82bc42d 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -805,7 +805,7 @@ $(idir)/etc:; mkdir $@
# Note: cert.pm has to be AFTER the tarball, otherwise the build script
# will try to unpack cert.pm and crash (it unpacks the first dependency
# under `tdir').
-$(ibidir)/openssl: $(ibidir)/tar \
+$(ibidir)/openssl: $(ibidir)/perl \
$(tdir)/openssl-$(openssl-version).tar.gz \
$(tdir)/cert.pem \
| $(idir)/etc
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) \