aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2019-04-04 12:30:33 +0100
committerRaul Infante-Sainz <infantesainz@gmail.com>2019-04-04 12:30:33 +0100
commitef19dbeb3aa7131754e03ce6d3ccd66db9fd81fd (patch)
tree9a943c6500858c232df05d5a1dba0c9dea9cf628
parent2d500f26e9777fc395131301404cf06c0d1a2951 (diff)
Using host GCC on Mac, defining compilers in HDF5 library
We wer not able to build `gcc' on Mac, so we are using links to the host compilers. In this commit we also found that on Mac the HDF5 library needs an explicit definition of the compilers.
-rw-r--r--reproduce/src/make/dependencies-basic.mk19
-rw-r--r--reproduce/src/make/dependencies.mk2
2 files changed, 12 insertions, 9 deletions
diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk
index 69d2d84..74a04ed 100644
--- a/reproduce/src/make/dependencies-basic.mk
+++ b/reproduce/src/make/dependencies-basic.mk
@@ -767,14 +767,15 @@ $(ibdir)/gcc: $(gcc-prerequisites) \
# in '$(idir)/lib' by defining the '$(idir)/lib64' as a symbolic
# link to '$(idir)/lib'.
-# SO FAR IT SEEMS TO BE WORKING ON MAC, BUT MORE TESTS ARE NEEDED TO TOTALLY
-# REMOVE THE STEP WHERE WE JUST USE THE HOST'S GCC.
-# if [ "x$(on_mac_os)" = xyesno ]; then \
-# $(call makelink,gfortran); \
-# $(call makelink,g++); \
-# $(call makelink,gcc,copy); \
-# else \
-
+# SO FAR WE HAVEN'T BEEN ABLE TO GET A CONSISTENT BUILD OF GCC ON MAC
+# (SOMETIMES IT CRASHES IN libiberty with g++) AND SOMETIMES IT FINISHES,
+# SO, MORE TESTS ARE NEEDED ON MAC AND WE'LL USE THE HOST'S COMPILER UNTIL
+# THEN.
+ if [ "x$(on_mac_os)" = xyesno ]; then \
+ $(call makelink,gfortran); \
+ $(call makelink,g++); \
+ $(call makelink,gcc,copy); \
+ else \
rm -f $(ibdir)/gcc* $(ibdir)/g++ $(ibdir)/gfortran $(ibdir)/gcov*;\
rm -rf $(ildir)/gcc $(ildir)/libcc* $(ildir)/libgcc*; \
rm -rf $(ildir)/libgfortran* $(ildir)/libstdc* rm $(idir)/x86_64*;\
@@ -817,5 +818,5 @@ $(ibdir)/gcc: $(gcc-prerequisites) \
fi; \
done; \
fi; \
-# fi
+ fi
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk
index a1f1b23..fe29d1b 100644
--- a/reproduce/src/make/dependencies.mk
+++ b/reproduce/src/make/dependencies.mk
@@ -273,6 +273,8 @@ $(ilidir)/freetype: $(tdir)/freetype-$(freetype-version).tar.gz \
$(ilidir)/hdf5: $(tdir)/hdf5-$(hdf5-version).tar.gz \
$(ilidir)/openmpi
+ export CC=mpicc; \
+ export FC=mpif90; \
$(call gbuild, $<, hdf5-$(hdf5-version), static, \
--enable-parallel \
--enable-fortran, V=1) \