changeset 20627:9ad7cdb7137e

mk: use compilers from PATH by default, not gcc 4.9
author Lauri Tirkkonen <lotheac@iki.fi>
date Wed, 22 May 2019 22:28:02 +0000
parents 28ac1026d799
children 2fefbdca1423
files lib/libncurses/config.mk share/mk/sys.mk
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lib/libncurses/config.mk	Wed May 22 20:43:13 2019 +0000
+++ b/lib/libncurses/config.mk	Wed May 22 22:28:02 2019 +0000
@@ -20,9 +20,6 @@
 SHLIB_MINOR=	0
 
 AWK		= awk
-CC		= /usr/gcc/4.9/bin/gcc
-CPP		= /usr/gcc/4.9/bin/gcc -E
-SHELL		= /bin/sh
 
 USE_BIG_STRINGS = 1
 ENABLE_WIDEC=   1
--- a/share/mk/sys.mk	Wed May 22 20:43:13 2019 +0000
+++ b/share/mk/sys.mk	Wed May 22 22:28:02 2019 +0000
@@ -46,18 +46,18 @@
 COMPILE.S?=	${CC} ${AFLAGS} ${CPPFLAGS} -c
 LINK.S?=	${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-CC?=		/usr/gcc/4.9/bin/gcc
-CPP?=		/usr/gcc/4.9/bin/cpp
+CC?=		cc
+CPP?=		cpp
 CFLAGS?=	-O2 ${PIPE} ${DBG}
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-CXX?=		/usr/gcc/4.9/bin/g++
+CXX?=		c++
 CXXFLAGS?=	${CFLAGS}
 COMPILE.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
 LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
-FC?=		/usr/gcc/4.9/bin/gfortran
+FC?=		gfortran
 FFLAGS?=	-O
 RFLAGS?=
 COMPILE.f?=	${FC} ${FFLAGS} -c