[gcc-7] 118/354: * Allow to disable brig in DEB_BUILD_OPTIONS. Closes: #856452.

[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 dfbcaa171128e53fe95b4d133fcc4bb97453e069
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Mar 1 08:46:02 2017 +0000

      * Allow to disable brig in DEB_BUILD_OPTIONS. Closes: #856452.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9319 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/rules.defs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3588d8..a32a29b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7-20170227-1) experimental; urgency=medium
   * Update gdc to trunk 20170227.
   * Update libcc1 symbols file.
   * Bump binutils version requirement.
+  * Allow to disable brig in DEB_BUILD_OPTIONS. Closes: #856452.
 
  -- Matthias Klose <doko at debian.org>  Mon, 27 Feb 2017 14:29:03 +0100
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 931bd61..6b675f6 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -840,11 +840,12 @@ endif
 with_brig := no
 ifneq (,$(filter $(DEB_TARGET_ARCH),amd64 i386 x32))
   with_brig := yes
-  with_brigdev := yes
-  with_libhsailrt := yes
 endif
+with_brig := $(call envfilt, brig, , , $(with_brig))
 
 ifeq ($(with_brig),yes)
+  with_brigdev := yes
+  with_libhsailrt := yes
   enabled_languages += brig
 endif
 

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