pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/openmsx openmsx: Pass CXX override as make f...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9046c14ab678
branches:  trunk
changeset: 338722:9046c14ab678
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 29 11:55:37 2019 +0000

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

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

diffstat:

 emulators/openmsx/Makefile |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (27 lines):

diff -r 48ea13de639c -r 9046c14ab678 emulators/openmsx/Makefile
--- a/emulators/openmsx/Makefile        Thu Aug 29 11:09:20 2019 +0000
+++ b/emulators/openmsx/Makefile        Thu Aug 29 11:55:37 2019 +0000
@@ -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 @@
 .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:



Home | Main Index | Thread Index | Old Index