aboutsummaryrefslogtreecommitdiff
path: root/reproduce/src
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2019-01-23 13:17:48 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2019-01-23 13:17:48 +0000
commit796ed341fbeb9688eaabefe020977fba9f6f35f6 (patch)
tree07cc26289a3f13e52fbe1e4af0ddc9f9e567a0c2 /reproduce/src
parent86888f4b305d3725335b9be44d6659b1a07e5d34 (diff)
Corrected check for patchelf when building Bash
Until now, the check to see if the patchelf program should be used or not (for GNU/Linux vs. Mac installations) was mistakenly added over the step that we define the `sh' symbolic link, not over the call to patchelf. This is corrected with this commit.
Diffstat (limited to 'reproduce/src')
-rw-r--r--reproduce/src/make/dependencies-basic.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index eb6bcce..184d089 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -468,9 +468,13 @@ $(ibdir)/bash: $(tdir)/bash-$(bash-version).tar.gz \
$(call gbuild, $<, bash-$(bash-version),, \
--with-installed-readline=$(ildir) $$stopt )
- # Since Bash doesn't include RPATH by default, we'll have to
- # manually include it using the `patchelf' program.
- if [ -f $@ ]; then $(ibdir)/patchelf --set-rpath $(ildir) $@; fi
+ # Atleast on GNU/Linux systems, Bash doesn't include RPATH by
+ # default. So, we have to manually include it, currently we are
+ # only doing this on GNU/Linux systems (using the `patchelf'
+ # program).
+ if [ "x$(needpatchelf)" != x ]; then \
+ if [ -f $@ ]; then $(ibdir)/patchelf --set-rpath $(ildir) $@; fi \
+ fi
# To be generic, some systems use the `sh' command to call the
# shell. By convention, `sh' is just a symbolic link to the
@@ -480,9 +484,7 @@ $(ibdir)/bash: $(tdir)/bash-$(bash-version).tar.gz \
# Just to be sure that the installation step above went well,
# before making the link, we'll see if the file actually exists
# there.
- if [ "x$(needpatchelf)" != x ]; then \
- if [ -f $@ ]; then ln -fs $@ $(ibdir)/sh; else exit 1; fi; \
- fi
+ if [ -f $@ ]; then ln -fs $@ $(ibdir)/sh; else exit 1; fi
@@ -588,6 +590,7 @@ $(ibdir)/find: $(tdir)/findutils-$(findutils-version).tar.lz \
$(ibdir)/gawk: $(tdir)/gawk-$(gawk-version).tar.lz \
$(ibdir)/bash
+ # Build the main program.
$(call gbuild, $<, gawk-$(gawk-version), static, \
--with-readline=$(idir));