[pkgsrc/trunk]: pkgsrc/lang/gcc7 lang/gcc7: Refine the condition...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb2694e40ac7
branches:  trunk
changeset: 307215:bb2694e40ac7
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed May 02 18:38:30 2018 +0000
description:
lang/gcc7: Refine the condition to enable multilib

diffstat:

 lang/gcc7/options.mk |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r eeacd33737e4 -r bb2694e40ac7 lang/gcc7/options.mk
--- a/lang/gcc7/options.mk      Wed May 02 18:16:34 2018 +0000
+++ b/lang/gcc7/options.mk      Wed May 02 18:38:30 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/05/10 15:02:29 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2018/05/02 18:38:30 minskim Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -22,8 +22,13 @@
 ###
 MULTILIB_SUPPORTED?=   unknown
 .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
-.  if exists(/usr/include/gnu/stubs-64.h) && \
-     !exists(/usr/include/gnu/stubs-32.h)
+.  if exists(/usr/include/x86_64-linux-gnu/gnu)
+_GNU_INCLUDE_DIR=      /usr/include/x86_64-linux-gnu/gnu
+.  else
+_GNU_INCLUDE_DIR=      /usr/include/gnu
+.  endif
+.  if exists(${_GNU_INCLUDE_DIR}/stubs-64.h) && \
+     !exists(${_GNU_INCLUDE_DIR}/stubs-32.h)
 MULTILIB_SUPPORTED=No
 .  else
 MULTILIB_SUPPORTED=Yes