CVS commit: pkgsrc/cross/mingw-w64-x86_64-crt

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Oct 17 11:43:47 UTC 2026

Modified Files:
        pkgsrc/cross/mingw-w64-x86_64-crt: Makefile.common

Log Message:
cross/mingw-w64-*-crt: Fix sysroot and includes

In particular, don't leak ${PREFIX}/include into the flags, as that
*will* break the build by making ${PREFIX}/include/profile.h being
picked up.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common

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

Modified files:

Index: pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common
diff -u pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common:1.11 pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common:1.12
--- pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common:1.11      Thu Nov 28 20:01:37 2024
+++ pkgsrc/cross/mingw-w64-x86_64-crt/Makefile.common   Sat Oct 17 11:43:47 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2024/11/28 20:01:37 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.12 2026/10/17 11:43:47 js Exp $
 #
 # used by cross/mingw-w64-i686-crt/Makefile
 # used by cross/mingw-w64-x86_64-crt/Makefile
@@ -28,9 +28,12 @@ USE_GNU_CONFIGURE_HOST=      no
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_PREFIX=  ${PREFIX}/cross/${MINGW_TARGET}-${CRT_TYPE}/mingw
 CONFIGURE_ARGS+=       --host=${MINGW_TARGET}
-CONFIGURE_ARGS+=       --with-sysroot=${PREFIX}/cross/${MINGW_TARGET}-${CRT_TYPE}
+CONFIGURE_ARGS+=       --with-sysroot=${PREFIX}/cross/${MINGW_TARGET}-${CRT_TYPE}/mingw
 CONFIGURE_ARGS+=       --enable-wildcard
 CONFIGURE_ARGS+=       --with-default-msvcrt=${CRT_TYPE}
+# Don't leak -I${PREFIX}/include into the flags, it breaks the build because
+# then the native profile.h is picked up.
+CONFIGURE_ARGS+=       CPPFLAGS= CFLAGS=-O2 CXXFLAGS=-O2
 CONFIGURE_ENV+=                ac_cv_prog_CC=${MINGW_TARGET}-gcc
 
 PREPEND_PATH+=         ${PREFIX}/cross/${MINGW_TARGET}/bin