- Fix build when CC is absolute path

Upstream build scripts have some machinery to include compiler-specific
.mak file depending on compiler used. This is handled in an ugly way by the
port, roughly, upstream makefile includes ${CC}.mak and ports Makefile
copies that from default .mak. This is breaks when CC is an absolute path
and is useless anyway, as even if it was implemented properly, customized
.mak files are for compilers we'll never use such as gcc 3.2, intel and suncc.

So make upstream makefile always include the default .mak.

PR:		215253
Approved by:	maintainer timeout (mi@aldan.algebra.com, 6 weeks)
MFH:		2017Q1
This commit is contained in:
Dmitry Marakasov 2017-01-30 10:09:28 +00:00
parent 239c6a9f27
commit 441a24d9ee
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=432825
2 changed files with 12 additions and 4 deletions

View file

@ -87,14 +87,11 @@ do-configure:
# This step helps non-i386 systems and is harmless on i386
-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH:S/armv6/arm/}_unknown.mak
.endfor
${REINPLACE_CMD} \
@${REINPLACE_CMD} \
-e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \
-e '/^CXXFLAGS *=/s|$$| ${CXXFLAGS}|' \
-e 's,^OPTIMI,#OPTIMI,' \
${WRKSRC}/speech_tools/config/compilers/gcc*.mak
# This step helps to use a compiler, the vendor has not seen before:
${TEST} -e ${WRKDIR}/speech_tools/config/compilers/${CC}.mak || \
${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak
do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}

View file

@ -0,0 +1,11 @@
--- speech_tools/config/compilers/gcc.mak.orig 2001-04-04 11:55:32 UTC
+++ speech_tools/config/compilers/gcc.mak
@@ -38,8 +38,4 @@
## ##
###########################################################################
-ifdef GCC
-include $(EST)/config/compilers/$(GCC).mak
-else
include $(EST)/config/compilers/gcc_defaults.mak
-endif