Skip to content

Commit

Permalink
bsd.prefs.mk: Work around broken bsd.own.mk OBJECT_FMT on AIX too.
Browse files Browse the repository at this point in the history
PR pkg/58315: pkgsrc reports "object format ``PE'' which differs from ``ELF''" in cygwin
  • Loading branch information
riastradh committed Jul 11, 2024
1 parent 0021e32 commit 5570fc1
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mk/bsd.prefs.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.450 2024/07/10 18:24:01 riastradh Exp $
# $NetBSD: bsd.prefs.mk,v 1.451 2024/07/11 01:50:10 riastradh Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
Expand Down Expand Up @@ -413,7 +413,10 @@ TARGET_MACHINE_PLATFORM= ${TARGET_OPSYS}-${TARGET_OS_VERSION}-${TARGET_MACHINE_A
# or Cygwin (XXX or HP-UX or AIX or OSF/1 or ...).
#
# We will later set OBJECT_FMT to be conditional on USE_CROSS_COMPILE.
.if ${NATIVE_OPSYS} == "Cygwin"
.if ${NATIVE_OPSYS} == "AIX"
NATIVE_OBJECT_FMT?= XCOFF
OBJECT_FMT?= XCOFF
.elif ${NATIVE_OPSYS} == "Cygwin"
NATIVE_OBJECT_FMT?= PE
OBJECT_FMT?= PE
.elif ${NATIVE_OPSYS} == "Darwin"
Expand Down

0 comments on commit 5570fc1

Please sign in to comment.