aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/make
diff options
context:
space:
mode:
authorPrasenjit Saha <psaha@physik.uzh.ch>2019-06-28 11:15:48 +0200
committerPrasenjit Saha <psaha@physik.uzh.ch>2019-06-28 11:16:46 +0200
commit73cd532901865fe0b3a53c3e526ab5f7bd7d3122 (patch)
treea05b7907ac36ac2990616783bcea1b5787a09e32 /reproduce/software/make
parent5761eecf6c9018f204c9b3a4e6b9313d24ae7d16 (diff)
Corrections to basic build
Several corrections were necessary in the basic build: 1) the version of GCC on some systems includes an `_' which would cause a crash when building the PDF. 2) libcharset had to be manually added to the Git build.
Diffstat (limited to 'reproduce/software/make')
-rw-r--r--reproduce/software/make/basic.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index 9628140..81e8512 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -844,8 +844,9 @@ $(ibidir)/libiconv: $(tdir)/libiconv-$(libiconv-version).tar.gz \
$(ibidir)/git: $(tdir)/git-$(git-version).tar.xz \
$(ibidir)/libiconv \
$(ibidir)/curl # Coreutils, so Git is built after it.
+ export LDFLAGS=-lcharset; \
$(call gbuild, $<, git-$(git-version), static, \
- --without-tcltk --with-shell=$(ibdir)/bash \
+ --without-tcltk --with-shell=$(ibdir)/bash \
--with-iconv=$(idir), V=1) \
&& echo "Git $(git-version)" > $@