From 8748d3e93fbe60511912fbe6ac424a6d6352de4f Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Fri, 22 Mar 2019 17:58:45 +0000
Subject: On Mac systems, using a copy of GCC, not a link

Until now we were using a symbolic link to replace GCC, but Make doesn't
treat symbolic links like files. So it would rebuild the links every
time. With this commit, only for GCC on Mac systems, we are actually
copying the host's GCC executable to avoid this problem.

Also, a wrong comment for cURL was removed.
---
 reproduce/src/make/dependencies-basic.mk | 7 ++++---
 reproduce/src/make/dependencies.mk       | 7 +------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'reproduce/src/make')

diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 4d39141..76bfa16 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -206,8 +206,9 @@ makelink = origpath="$$PATH";                                          \
 	   export PATH=$$(echo $(syspath) | tr : '\n' | grep -v ccache \
 	                       | paste -s -d:);                        \
 	   a=$$(which $(1) 2> /dev/null);                              \
-	   if [ -f $(ibdir)/$(1) ]; then rm $(ibdir)/$(1); fi;         \
-	   if [ x$$a != x ]; then ln -s $$a $(ibdir)/$(1); fi;         \
+	   if [ -e $(ibdir)/$(1) ]; then rm $(ibdir)/$(1); fi;         \
+	   if [ x"$(2)" = xcopy ]; then c=cp; else c="ln -s"; fi;      \
+	   if [ x$$a != x ]; then $$c $$a $(ibdir)/$(1); fi;           \
 	   export PATH="$$origpath"
 $(ibdir) $(ildir):; mkdir $@
 $(ibdir)/low-level-links: | $(ibdir) $(ildir)
@@ -768,7 +769,7 @@ $(ibdir)/gcc: $(gcc-prerequisites)  \
 	if [ "x$(on_mac_os)" = xyes ]; then                                \
 	  $(call makelink,gfortran);                                       \
 	  $(call makelink,g++);                                            \
-	  $(call makelink,gcc);                                            \
+	  $(call makelink,gcc,copy);                                       \
 	else                                                               \
 	                                                                   \
 	  rm -f $(ibdir)/gcc* $(ibdir)/g++ $(ibdir)/gfortran $(ibdir)/gcov*;\
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk
index f89c176..d797cdb 100644
--- a/reproduce/src/make/dependencies.mk
+++ b/reproduce/src/make/dependencies.mk
@@ -416,11 +416,6 @@ $(ibdir)/cmake: $(tdir)/cmake-$(cmake-version).tar.gz \
 	make install &&                                            \
 	cd ..&& rm -rf cmake-$(cmake-version)
 
-# Some programs that depend on cURL (in particular CMake) don't necessarily
-# have easiy ways to explicity tell them to also link with libcurl's
-# dependencies (libssl, libcrypto, and libz). So we won't force curl to
-# only be static.
-#
 # cURL (and its library, which is needed by several programs here) can
 # optionally link with many different network-related libraries on the host
 # system that we are not yet building in the pipeline. Many of these are
@@ -446,7 +441,7 @@ $(ibdir)/curl: $(tdir)/curl-$(curl-version).tar.gz
 	               --without-axtls                   \
 	               --disable-ldaps                   \
 	               --disable-ldap                    \
-	               --without-nss )
+	               --without-nss, V=1)
 
 # On Mac OS, libtool does different things, so to avoid confusion, we'll
 # prefix GNU's libtool executables with `glibtool'.
-- 
cgit v1.2.1