From 3a8522600361a7ba8acc1239439f823452b691e3 Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Thu, 18 Jun 2020 10:07:57 +0100
Subject: Fixed small bug that was introduced four commits ago
In Commit 105467fe6402 (Software tarballs are downloaded even if not
built), we introduced tests to download the tarballs of software even if
they don't need to be built on the respective host. However some small
typos in the checks existed that could cause a crash on macOS. In
particular in the building of PatchELF and libbsd we had forgot to add the
necessary 'x' before the 'yes' in the conditional to check if a we are on
macOS or not.
With this commit these two checks have been corrected. Also, in the
building of 'isl' and 'mpc', we now check for 'host_cc' (signifying that
the user wants to use their host C compiler for the high-level step)
instead of 'on_mac_os'. The reason is that even on non-macOS systems, a
user may not want to build the C compiler from scratch and use the
'--host-cc' option. In such cases, they don't need to compile 'isl' and
'mpc'.
---
.file-metadata | Bin 9121 -> 8865 bytes
reproduce/software/make/basic.mk | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.file-metadata b/.file-metadata
index 3a4122f..c5363f0 100644
Binary files a/.file-metadata and b/.file-metadata differ
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index dd4a84c..dc28631 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -587,7 +587,7 @@ $(ibidir)/readline: $(ibidir)/ncurses \
$(ibidir)/patchelf: $(ibidir)/tar \
$(tdir)/patchelf-$(patchelf-version).tar.gz
- if [ x$(on_mac_os) = yes ]; then
+ if [ x$(on_mac_os) = xyes ]; then
echo "" > $@
else
$(call gbuild, patchelf-$(patchelf-version)) \
@@ -1038,7 +1038,7 @@ $(ibidir)/grep: $(ibidir)/coreutils \
$(ibidir)/libbsd: $(ibidir)/coreutils \
$(tdir)/libbsd-$(libbsd-version).tar.xz
- if [ x$(on_mac_os) = yes ]; then
+ if [ x$(on_mac_os) = xyes ]; then
echo "" > $@
else
$(call gbuild, libbsd-$(libbsd-version), static,,V=1) \
@@ -1211,7 +1211,7 @@ $(ibidir)/which: $(ibidir)/coreutils \
# -------------------------
$(ibidir)/isl: $(ibidir)/gmp \
$(tdir)/isl-$(isl-version).tar.bz2
- if [ x$(on_mac_os) = xyes ]; then
+ if [ $(host_cc) = 1 ]; then
echo "" > $@
else
$(call gbuild, isl-$(isl-version), static, , V=1) \
@@ -1220,7 +1220,7 @@ $(ibidir)/isl: $(ibidir)/gmp \
$(ibidir)/mpc: $(ibidir)/mpfr \
$(tdir)/mpc-$(mpc-version).tar.gz
- if [ x$(on_mac_os) = xyes ]; then
+ if [ $(host_cc) = 1 ]; then
echo "" > $@
else
$(call gbuild, mpc-$(mpc-version), static, , , make check) \
--
cgit v1.2.1