CVS commit: pkgsrc/lang/gcc7

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Wed May  2 18:38:30 UTC 2018

Modified Files:
        pkgsrc/lang/gcc7: options.mk

Log Message:
lang/gcc7: Refine the condition to enable multilib


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc7/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc7/options.mk
diff -u pkgsrc/lang/gcc7/options.mk:1.2 pkgsrc/lang/gcc7/options.mk:1.3
--- pkgsrc/lang/gcc7/options.mk:1.2     Wed May 10 15:02:29 2017
+++ pkgsrc/lang/gcc7/options.mk Wed May  2 18:38:30 2018
@@ -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 @@ PKG_SUGGESTED_OPTIONS+=      gcc-inplace-math
 ###
 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