[gcc-7] 236/354: Revert: * Try again building gnat on armel. See issue #861734.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 5a4078f0d9ecbae69d784e974e7de8bff8724efa
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Jun 28 12:05:52 2017 +0000

      Revert:
      * Try again building gnat on armel. See issue #861734.
    
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9554 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 -
 debian/rules.defs | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 686223b..2cb56f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ gcc-7 (7.1.0-7ubuntu1) UNRELEASED; urgency=medium
   * Move the liblto_plugin from the cpp to the gcc package.
   * libstdc++6: Add more Breaks to smoothen upgrades from jessie to stretch.
     Addresses: #863845, #863745.
-  * Try again building gnat on armel. See issue #861734.
   * Don't provide libobjc_gc symlinks for the libobjc multilib packages.
   * Configure with --enable-default-pie on ppc64 (Adrian Glaubitz) and
     powerpc (Mathieu Malaterre).  Addresses: #856224.
diff --git a/debian/rules.defs b/debian/rules.defs
index da90f45..ee62323 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -663,6 +663,11 @@ endif
 ifneq (,$(filter $(DEB_TARGET_ARCH),kfreebsd-i386 kfreebsd-amd64 hurd-i386))
   with_ada := disabled for architecture $(DEB_TARGET_ARCH)
 endif
+ifeq (,$(findstring cross,$(build_type)))
+  ifneq (,$(filter $(DEB_TARGET_ARCH),armel))
+    with_ada := native gnat disabled for architecture $(DEB_TARGET_ARCH)
+  endif
+endif
 ifneq (,$(findstring $(DEB_TARGET_GNU_SYSTEM),$(ada_no_systems)))
   with_ada := disabled for system $(DEB_TARGET_GNU_SYSTEM)
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git