CVS commit: pkgsrc/emulators/openmsx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug 29 11:55:37 UTC 2019

Modified Files:
        pkgsrc/emulators/openmsx: Makefile

Log Message:
openmsx: Pass CXX override as make flag rather than in the environment.

Seems to help avoid the wrath of the invalid compiler detector.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/emulators/openmsx/Makefile

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

Modified files:

Index: pkgsrc/emulators/openmsx/Makefile
diff -u pkgsrc/emulators/openmsx/Makefile:1.56 pkgsrc/emulators/openmsx/Makefile:1.57
--- pkgsrc/emulators/openmsx/Makefile:1.56      Tue Jul  2 08:31:02 2019
+++ pkgsrc/emulators/openmsx/Makefile   Thu Aug 29 11:55:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2019/07/02 08:31:02 nia Exp $
+# $NetBSD: Makefile,v 1.57 2019/08/29 11:55:37 nia Exp $
 
 DISTNAME=              openmsx-0.15.0
 CATEGORIES=            emulators
@@ -41,12 +41,12 @@ GCC_REQD+=  5
 .include "../../mk/bsd.prefs.mk"
 
 do-configure:
-.if !empty(PKGSRC_COMPILER:Mclang)
-       cd ${WRKSRC} && ${CONFIGURE_ENV} CXX=clang++ \
-           ${GMAKE} -f build/main.mk probe
+.if !empty(PKGSRC_COMPILER:M*clang*)
+       cd ${WRKSRC} && ${CONFIGURE_ENV} \
+           ${GMAKE} -f build/main.mk probe CXX=clang++
 .else
-       cd ${WRKSRC} && ${CONFIGURE_ENV} CXX=g++ \
-           ${GMAKE} -f build/main.mk probe
+       cd ${WRKSRC} && ${CONFIGURE_ENV} \
+           ${GMAKE} -f build/main.mk probe CXX=g++
 .endif
 
 post-extract: