From ca2a2263a744b7c6f6f551ba68906f43afe04522 Mon Sep 17 00:00:00 2001 From: tijl Date: Mon, 2 Sep 2013 13:26:34 +0000 Subject: Two imake related changes: 1) Move -a from XMKMF command variable to a new XMKMF_ARGS variable. For ports that don't need -a introduce USES=imake:notall. This way ports no longer have to redefine XMKMF. 2) xmkmf -a runs imake with the flags in IMAKECPPFLAGS as extra arguments to set CPP, CC and CXX. This creates the top Makefile, and then xmkmf runs make Makefiles. This Makefiles target runs imake for each subdirectory but these imake invocations did not have the flags from IMAKECPPFLAGS so the resulting makefiles used the wrong C preprocessor when clang is used (/usr/bin/cpp instead of /usr/local/bin/tradcpp). Instead of letting xmkmf pass IMAKECPPFLAGS from the environment to imake let imake handle IMAKECPPFLAGS itself just like it handles IMAKEINCLUDE. This exposed configure errors in x11-clocks/mouseclock and x11-wm/fvwm. Approved by: portmgr (bapt) --- Mk/bsd.commands.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mk/bsd.commands.mk') diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 5eb0230c9518..3da333dbf329 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -97,7 +97,7 @@ UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself UNZIP_CMD?= ${LOCALBASE}/bin/unzip WHICH?= /usr/bin/which XARGS?= /usr/bin/xargs -XMKMF?= ${LOCALBASE}/bin/xmkmf -a +XMKMF?= ${LOCALBASE}/bin/xmkmf YACC?= /usr/bin/yacc XZ?= -Mmax -- cgit