summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorsevan <sevan@pkgsrc.org>2015-09-07 15:07:54 +0000
committersevan <sevan@pkgsrc.org>2015-09-07 15:07:54 +0000
commit11ae2f4ee0896dc9d504bde70c35854d68fa7b3e (patch)
tree8bdd62c19553b6eb078662f5a65600aa903e340c /pkgtools
parent7ebe74806b16ac11206df0f2f1d4a730444f7bc9 (diff)
downloadpkgsrc-11ae2f4ee0896dc9d504bde70c35854d68fa7b3e.tar.gz
We currently detect $MACHINE_ARCH on OpenBSD/amd64 & Bitrig/amd64 as amd64.
Bitrig uses ELF on amd64 & arm and does not have any legacy dependency on a.out. Remove if statement to check $MACHINE_ARCH is x86_64 in-order to set $OBJECT_FMT to ELF, preventing $OBJECT_FMT being set to a.out by mistake. Reviewed by joerg@
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
index 6ecc1306134..cbec7aa46f8 100644
--- a/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
+++ b/pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
@@ -1,4 +1,4 @@
-# $NetBSD: Bitrig.bsd.own.mk.in,v 1.1 2015/06/04 15:48:45 sevan Exp $
+# $NetBSD: Bitrig.bsd.own.mk.in,v 1.2 2015/09/07 15:07:54 sevan Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -90,11 +90,7 @@ STRIPFLAG?= -s
# OBJECT_FMT: currently either "ELF" or "a.out".
# SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries.
#
-.if ${MACHINE_ARCH} == "x86_64"
OBJECT_FMT?=ELF
-.else
-OBJECT_FMT?=a.out
-.endif
# Location of the file that contains the major and minor numbers of the
# version of a shared library. If this file exists a shared library