diff options
| -rw-r--r-- | reproduce/software/config/installation/versions.mk | 2 | ||||
| -rw-r--r-- | reproduce/software/make/basic.mk | 53 |
2 files changed, 28 insertions, 27 deletions
diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 5c7743d..22bda58 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -30,7 +30,7 @@ diffutils-version = 3.7 file-version = 5.36 findutils-version = 4.6.0.199-e3fc gawk-version = 5.0.0 -gcc-version = 8.3.0 +gcc-version = 9.1.0 git-version = 2.21.0 gmp-version = 6.1.2 grep-version = 3.3 diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index db779a1..cd41221 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -1067,34 +1067,35 @@ $(ibidir)/gcc: $(gcc-prerequisites) \ ln -fs $(ildir) $(idir)/lib64; \ \ cd $(ddir); \ - rm -rf gcc-build gcc-$(gcc-version); \ + rm -rf gcc-$(gcc-version); \ tar xf $< \ - && mkdir $(ddir)/gcc-build \ - && cd $(ddir)/gcc-build \ - && ../gcc-$(gcc-version)/configure SHELL=$(ibdir)/bash \ - --prefix=$(idir) \ - --with-mpc=$(idir) \ - --with-mpfr=$(idir) \ - --with-gmp=$(idir) \ - --with-isl=$(idir) \ - --with-build-time-tools=$(idir) \ - --enable-shared \ - --disable-multilib \ - --disable-multiarch \ - --enable-threads=posix \ - --with-local-prefix=$(idir) \ - --enable-languages=c,c++,fortran,objc,obj-c++ \ - --disable-libada \ - --disable-nls \ - --enable-default-pie \ - --enable-default-ssp \ - --enable-cet=auto \ - --enable-decimal-float \ - && make SHELL=$(ibdir)/bash -j$$(nproc) \ + && cd gcc-$(gcc-version) \ + && mkdir build \ + && cd build \ + && ../configure SHELL=$(ibdir)/bash \ + --prefix=$(idir) \ + --with-mpc=$(idir) \ + --with-mpfr=$(idir) \ + --with-gmp=$(idir) \ + --with-isl=$(idir) \ + --with-build-time-tools=$(idir) \ + --enable-shared \ + --enable-lto \ + --disable-multilib \ + --disable-multiarch \ + --enable-threads=posix \ + --with-local-prefix=$(idir) \ + --enable-languages=c,c++,fortran,objc,obj-c++ \ + --disable-libada \ + --disable-nls \ + --enable-default-pie \ + --enable-default-ssp \ + --enable-cet=auto \ + --enable-decimal-float \ + && make SHELL=$(ibdir)/bash -j$(numthreads) \ && make SHELL=$(ibdir)/bash install \ - && cd .. \ - && rm -rf gcc-build gcc-$(gcc-version) \ - \ + && cd ../.. \ + && rm -rf gcc-$(gcc-version) \ && if [ "x$(on_mac_os)" != xyes ]; then \ for f in $$(find $(idir)/libexec/gcc); do \ if ldd $$f &> /dev/null; then \ |