diff --git a/etc/mk.conf b/etc/mk.conf index e9d0c4a05..c1715c733 100644 --- a/etc/mk.conf +++ b/etc/mk.conf @@ -1,5 +1,3 @@ -MAKEVERBOSE?= 1 - .if defined(BSD_PKG_MK) && "${PROG:U}" != "pkgin" .error Please use bmake for pkgsrc instead of the base system make. .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 448d098f6..6df89b897 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -85,12 +85,6 @@ LDS_RELOC= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xr LDS_SHARED_LIB= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xsc LDS_N= ${LDS_PATH}/elf_${MACHINE_ARCH}_minix.xbn -# LSC In the current state there is too much to be done -# Some package have been identified by directly adding NOGCCERROR -# To their Makefiles -NOGCCERROR?= yes -NOCLANGERROR?= yes - AFLAGS+= -D__ASSEMBLY__ CFLAGS+= -fno-builtin @@ -1371,7 +1365,7 @@ MAKEDIRTARGET=\ # 3 Ignore the effect of the "@" prefix in make commands # 4 Trace shell commands using the shell's -x flag # -MAKEVERBOSE?= 2 +MAKEVERBOSE:= 2 .if ${MAKEVERBOSE} == 0 _MKMSG?= @\#