CVS commit: pkgsrc/mk

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jul 11 01:50:10 UTC 2024

Modified Files:
        pkgsrc/mk: bsd.prefs.mk

Log Message:
bsd.prefs.mk: Work around broken bsd.own.mk OBJECT_FMT on AIX too.

PR pkg/58315: pkgsrc reports "object format ``PE'' which differs from ``ELF''" in cygwin


To generate a diff of this commit:
cvs rdiff -u -r1.450 -r1.451 pkgsrc/mk/bsd.prefs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.450 pkgsrc/mk/bsd.prefs.mk:1.451
--- pkgsrc/mk/bsd.prefs.mk:1.450        Wed Jul 10 18:24:01 2024
+++ pkgsrc/mk/bsd.prefs.mk      Thu Jul 11 01:50:10 2024
@@ -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.
 #
@@ -413,7 +413,10 @@ TARGET_MACHINE_PLATFORM=   ${TARGET_OPSYS}
 # 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"