[pkgsrc/trunk]: pkgsrc/mk/platform When building 32-bit packages on x86_64 GN...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1a0d0d75883
branches:  trunk
changeset: 631485:b1a0d0d75883
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 07 15:03:15 2014 +0000

description:
When building 32-bit packages on x86_64 GNU ld isn't smart enough to
figure out the target architecture based on the objects so we need to
explicitly set it.

This allows bootstrap --abi=32 to complete successfully on x86_64.

diffstat:

 mk/platform/Linux.mk |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 3b06a472daa2 -r b1a0d0d75883 mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Fri Mar 07 14:59:42 2014 +0000
+++ b/mk/platform/Linux.mk      Fri Mar 07 15:03:15 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.59 2014/02/20 11:03:09 jperkin Exp $
+# $NetBSD: Linux.mk,v 1.60 2014/03/07 15:03:15 jperkin Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -111,6 +111,13 @@
 LIBABISUFFIX?= 64
 .endif
 
+# When building 32-bit packages on x86_64 GNU ld isn't smart enough to
+# figure out the target architecture based on the objects so we need to
+# explicitly set it.
+.if ${NATIVE_MACHINE_ARCH} == "x86_64" && ${MACHINE_ARCH} == "i386"
+_WRAP_EXTRA_ARGS.LD+=  -m elf_i386
+.endif
+
 ## Use _CMD so the command only gets run when needed!
 .if exists(/lib${LIBABISUFFIX}/libc.so.6)
 _GLIBC_VERSION_CMD=    /lib${LIBABISUFFIX}/libc.so.6 --version | \