summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-09-08 12:07:55 +0000
committerjperkin <jperkin@pkgsrc.org>2015-09-08 12:07:55 +0000
commitc27ac1484c3c56747c1052343453136ff432a753 (patch)
tree1923a8cd9ba061b244d9db5e5ce38c2db4486998 /mk
parent889f6fdb119d6459e6075a3a698cc86adb2bddad (diff)
downloadpkgsrc-c27ac1484c3c56747c1052343453136ff432a753.tar.gz
Ensure OBJECT_FMT is set to ELF on Linux rather than relying on the NetBSD
MAHCINE_ARCH settings in bsd.own.mk. Fixes at least Sevan's arm64 host.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.prefs.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index cfd28f8b1d6..fb0b00de4a4 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.368 2015/09/08 11:36:34 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.369 2015/09/08 12:07:55 jperkin Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -402,6 +402,8 @@ OBJECT_FMT= ELF
.elif ${OPSYS} == "MirBSD"
OBJECT_FMT= ELF
MKPROFILE= no
+.elif ${OPSYS} == "Linux"
+OBJECT_FMT= ELF
.elif ${OPSYS} == "AIX"
OBJECT_FMT= XCOFF
.elif ${OPSYS} == "OSF1"