diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/rules.d/binary-d.mk | 2 | ||||
| -rw-r--r-- | debian/rules.defs | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index f0bbed1..48b9b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gcc-5 (5.1.1-6) UNRELEASED; urgency=medium * Update to SVN 20150509 (r222970, 5.1.1) from the gcc-5-branch. + * Don't build gdc-multilib on armel. -- Matthias Klose <doko@debian.org> Sun, 10 May 2015 02:01:20 +0200 diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk index ce9bd10..855ebcf 100644 --- a/debian/rules.d/binary-d.mk +++ b/debian/rules.d/binary-d.mk @@ -1,4 +1,4 @@ -ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf))) +ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchsf))) arch_binaries := $(arch_binaries) gdc-multi endif arch_binaries := $(arch_binaries) gdc diff --git a/debian/rules.defs b/debian/rules.defs index 49923e3..b6ae844 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -1447,7 +1447,9 @@ define gen_biarch with_lib$1gfortrandev := yes endif ifeq ($$(with_libphobos),yes) - with_lib$1phobosdev := yes + ifeq (,$(filter $1, hf)) + with_lib$1phobosdev := yes + endif endif ifeq ($$(with_libssp),yes) with_lib$1ssp := yes @@ -1514,7 +1516,9 @@ define gen_biarch biarch_multidir_names += libgo endif ifeq ($(with_libphobos),yes) - biarch_multidir_names += libphobos + ifeq (,$(filter $1, hf)) + biarch_multidir_names += libphobos + endif endif export biarch_multidir_names ifneq (,$$(findstring 32,$1)) |