CVS commit: [pkgsrc-2024Q1] pkgsrc/mk

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Jun  7 13:40:13 UTC 2024

Modified Files:
        pkgsrc/mk [pkgsrc-2024Q1]: bsd.prefs.mk

Log Message:
Pullup ticket #6856 - requested by riastradh
bsd.prefs.mk: Cygwin build fix

(via patch)

   Set OBJECT_FMT=PE on Cygwin in bsd.prefs.mk, to work around a bug
   in bootstrap-mk-files where it is incorrectly set to ELF.


To generate a diff of this commit:
cvs rdiff -u -r1.439 -r1.439.2.1 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.439 pkgsrc/mk/bsd.prefs.mk:1.439.2.1
--- pkgsrc/mk/bsd.prefs.mk:1.439        Fri Jan 26 03:25:47 2024
+++ pkgsrc/mk/bsd.prefs.mk      Fri Jun  7 13:40:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.439 2024/01/26 03:25:47 riastradh Exp $
+# $NetBSD: bsd.prefs.mk,v 1.439.2.1 2024/06/07 13:40:13 bsiegert Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -344,6 +344,8 @@ MACHINE_GNU_PLATFORM?=              ${MACHINE_GNU_AR
 # Set this before <bsd.own.mk> does, since it doesn't know about Darwin
 .if ${OPSYS} == "Darwin"
 OBJECT_FMT?=           Mach-O
+.elif ${OPSYS} == "Cygwin"
+OBJECT_FMT?=           PE
 .endif
 
 #