aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2019-03-25 14:45:47 +0000
committerRaul Infante-Sainz <infantesainz@gmail.com>2019-03-25 14:45:47 +0000
commit7d1d6f88fb28630cc581ea41c487b2b0c0da269f (patch)
tree3230a14c18d1e1399ddc24bda09f9769503a6911
parent8748d3e93fbe60511912fbe6ac424a6d6352de4f (diff)
Corrected makelink command to avoid paste command
We just noticed that recently the `paste' command on macOS doesn't work with a pipe. So we are now simply using the `tr' command in reverse to re-create the PATH (to find where to link to).
-rw-r--r--.file-metadatabin3927 -> 4510 bytes
-rw-r--r--reproduce/src/make/dependencies-basic.mk4
2 files changed, 2 insertions, 2 deletions
diff --git a/.file-metadata b/.file-metadata
index 5a4f942..7ca2f2d 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 76bfa16..b51f35d 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -202,9 +202,9 @@ $(tarballs): $(tdir)/%:
# is very annoying and can cause many complications. We thus remove any
# part of PATH of that has `ccache' in it before making symbolic links to
# the programs we are not building ourselves.
-makelink = origpath="$$PATH"; \
+makelink = origpath="$$PATH"; \
export PATH=$$(echo $(syspath) | tr : '\n' | grep -v ccache \
- | paste -s -d:); \
+ | tr '\n' :); \
a=$$(which $(1) 2> /dev/null); \
if [ -e $(ibdir)/$(1) ]; then rm $(ibdir)/$(1); fi; \
if [ x"$(2)" = xcopy ]; then c=cp; else c="ln -s"; fi; \