diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-22 15:06:44 +0100 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-22 15:06:44 +0100 |
commit | af681d01b3837ed205308a959834f6a5aa07307a (patch) | |
tree | ff5047f85e7b608460eb9876e23295604e05b54d /reproduce/software/make/basic.mk | |
parent | 57c4a65cd6dafe1c9a9f2961576d438c9394cd35 (diff) | |
parent | bc1011005dc58787fc26f9f091a9675fe88baeb7 (diff) |
Imported recent work on several astronomy packages
With this commit, Raul's work on the installation of several astronomy
software is implemented in the main template.
Diffstat (limited to 'reproduce/software/make/basic.mk')
-rw-r--r-- | reproduce/software/make/basic.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index cfa05d2..6e6550e 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -830,6 +830,7 @@ ifeq ($(host_cc),1) gcc-prerequisites = else gcc-prerequisites = $(tdir)/gcc-$(gcc-version).tar.xz \ + $(ibidir)/binutils \ $(ilidir)/isl \ $(ilidir)/mpc endif @@ -854,6 +855,8 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ $(call makelink,gcc); \ $(call makelink,g++,mandatory); \ $(call makelink,gfortran,mandatory); \ + $(call makelink,strip,mandatory); \ + ln -sf $$(which gcc) $(ibdir)/cc; \ ccinfo=$$(gcc --version | awk 'NR==1'); \ echo "C compiler (""$$ccinfo"")" > $@; \ else \ @@ -898,6 +901,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ patchelf --set-rpath $(ildir) $$f; \ fi; \ done; \ - fi \ + fi; \ + ln -sf $(ibdir)/gcc $(ibdir)/cc \ && echo "GNU Compiler Collection (GCC) $(gcc-version)" > $@; \ fi |