diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-04-30 19:12:56 +0100 |
| commit | 78737b78ac45d1213395819f3b85b4226088bd1a (patch) | |
| tree | ad87d71fab0d9963bcb944666dc4ac7873569ec0 /reproduce/software/make/basic.mk | |
| parent | b0993336112b244ea7e919d96ffdbaf167831b9d (diff) | |
| parent | 743637f54b99310defc2cc5bdbc1bbd8d3e09e0f (diff) | |
Imported some recent/parallel work, conflicts fixed
Especially because of the new convention regarding backslashes, there were
many conflicts that are now fixed. But none were substantial.
Diffstat (limited to 'reproduce/software/make/basic.mk')
| -rw-r--r-- | reproduce/software/make/basic.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index f2442ff..05161e9 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -16,6 +16,7 @@ # ------------------------------------------------------------------------ # # Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org> +# Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com> # # This Makefile is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -806,7 +807,8 @@ $(ibidir)/git: $(tdir)/git-$(git-version).tar.xz \ && echo "Git $(git-version)" > $@ $(ibidir)/gmp: $(tdir)/gmp-$(gmp-version).tar.lz \ - $(ibidir)/bash + $(ibidir)/bash \ + $(ibidir)/m4 $(call gbuild, $<, gmp-$(gmp-version), static, , , make check) \ && echo "GNU Multiple Precision Arithmetic Library $(gmp-version)" > $@ @@ -1038,7 +1040,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ 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*;\ - \ + \ ln -fs $(ildir) $(idir)/lib64; \ \ cd $(ddir); \ @@ -1076,7 +1078,7 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ patchelf --set-rpath $(ildir) $$f; \ fi; \ done; \ - fi; \ - ln -sf $(ibdir)/gcc $(ibdir)/cc \ + fi \ + && ln -sf $(ibdir)/gcc $(ibdir)/cc \ && echo "GNU Compiler Collection (GCC) $(gcc-version)" > $@; \ fi |