diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/gcc.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/gcc.scm')
| -rw-r--r-- | gnu/packages/gcc.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c07fdd2c80..5e2783d0dc 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -745,7 +745,10 @@ It also includes runtime support libraries for these languages.") (delete-file-recursively "texinfo") (substitute* "configure" (("host_tools=(.*)texinfo" _ before) - (string-append "host_tools=" before))))))) + (string-append "host_tools=" before))) + ;; Fix building on arm* with gcc-4+ + (substitute* "gcc/config/arm/arm.c" + (("arm_prog_mode") "arm_prgmode")))))) (supported-systems (fold delete %supported-systems '("powerpc64le-linux" "riscv64-linux"))) (native-inputs (list texinfo dejagnu)) @@ -778,6 +781,10 @@ It also includes runtime support libraries for these languages.") (("/lib/ld\\.so\\.1") (search-input-file inputs #$(glibc-dynamic-linker matching-system)))) + (substitute* "gcc/config/i386/gnu.h" + (("/lib/ld\\.so") + (search-input-file + inputs #$(glibc-dynamic-linker matching-system)))) (substitute* '("gcc/config/alpha/linux-elf.h" "gcc/config/arm/linux-elf.h" "gcc/config/i386/linux.h" @@ -1267,7 +1274,6 @@ provides the GNU compiler for the Go programming language.")) (version "0.24") (source (origin (method url-fetch) - ;; Used to be at isl.gforge.inria.fr. (uri (list (string-append "mirror://sourceforge/libisl/isl-" version ".tar.xz") (string-append %gcc-infrastructure |