summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2012-06-26 15:48:53 +0000
committerjperkin <jperkin@pkgsrc.org>2012-06-26 15:48:53 +0000
commitd0d2d9d9175cb0390e71018613ef66bbdb5c50aa (patch)
tree861669a95a8f2cb82f50d6b7ecdfdf3f46480c90 /mk
parent22199edee86327f5dd938e02b3a7aa0512f2be94 (diff)
downloadpkgsrc-d0d2d9d9175cb0390e71018613ef66bbdb5c50aa.tar.gz
Solaris needs -m32 for ABI=32 too, now that we have compilers which build
64-bit by default.
Diffstat (limited to 'mk')
-rw-r--r--mk/compiler/gcc.mk13
1 files changed, 2 insertions, 11 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index d3974bd6c8b..ccedd899875 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.120 2012/04/25 16:28:18 hans Exp $
+# $NetBSD: gcc.mk,v 1.121 2012/06/26 15:48:53 jperkin Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -607,16 +607,7 @@ _COMPILER_STRIP_VARS+= ${_GCC_VARS}
IMAKEOPTS+= -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
.endif
-.if ${OPSYS} == "SunOS"
-_COMPILER_ABI_FLAG.64= -m64
-.endif
-
-.if ${OPSYS} == "Darwin"
-_COMPILER_ABI_FLAG.32= -m32
-_COMPILER_ABI_FLAG.64= -m64
-.endif
-
-.if ${OPSYS} == "Linux"
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
_COMPILER_ABI_FLAG.32= -m32
_COMPILER_ABI_FLAG.64= -m64
.endif