tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce difference with NetBSD share/mk

Browse Source 
Move Minix-specific parameters from bsd.gcc.mk to bsd.own.mk,
which is any way patched. This enables then bsd.gcc.mk to be aligned
on the NetBSD version.

Also remove a few duplicate settings which are not anymore needed.

Change-Id: I93384527d3a2f18c8ece9fab9d24aa7ef8516a2d
This commit is contained in:
Lionel Sambuc 2013-03-14 16:47:36 +01:00
parent be776e3eaa
commit aad0eb7602
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/vfs/Makefile
View File

@ -14,7 +14,7 @@ SRCS+= gcov.c
CPPFLAGS+= -DUSE_COVERAGE CPPFLAGS+= -DUSE_COVERAGE
.endif .endif
CFLAGS+= -Wall -Wextra -Werror CFLAGS+= -Wall -Wextra -Werror -Wno-sign-compare
DPADD+= ${LIBSYS} ${LIBTIMERS} ${LIBEXEC} DPADD+= ${LIBSYS} ${LIBTIMERS} ${LIBEXEC}
LDADD+= -lsys -ltimers -lexec -lmthread LDADD+= -lsys -ltimers -lexec -lmthread

18
share/mk/bsd.gcc.mk
View File

@ -3,7 +3,7 @@
.if !defined(_BSD_GCC_MK_) .if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1 _BSD_GCC_MK_=1
.if defined(EXTERNAL_TOOLCHAIN) && !defined(__MINIX) .if defined(EXTERNAL_TOOLCHAIN)
_GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o _GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o
_GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o _GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o
_GCC_CRTEND!= ${CC} --print-file-name=crtend.o _GCC_CRTEND!= ${CC} --print-file-name=crtend.o
@ -23,20 +23,4 @@ _GCC_CRTDIR?= ${DESTDIR}/usr/lib
_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib _GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib
.endif .endif
.if defined(__MINIX)
AFLAGS+=-D__ASSEMBLY__
CPPFLAGS+= -fno-builtin -Wall -Wno-sign-compare
#LSC FIXME: Needed by clang for now
.if ${MACHINE_ARCH} == "i386"
CPUFLAGS+= -march=i586
.endif
# 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
.endif # defined(__MINIX)
.endif # ! defined(_BSD_GCC_MK_) .endif # ! defined(_BSD_GCC_MK_)

19
share/mk/bsd.own.mk
View File

@ -25,16 +25,27 @@ MANGRP?= operator
INFOGRP?= operator INFOGRP?= operator
DOCGRP?= operator DOCGRP?= operator
MKBINUTILS:= no MKBINUTILS?= no
MKGDB:= no MKGDB?= no
MKGCC?= no MKGCC?= no
# LSC To check if works # LSC In the current state there is too much to be done
#DESTDIR?= /usr/destdir.${MACHINE_ARCH} # # Some package have been identified by directly adding NOGCCERROR
# # To their Makefiles
NOGCCERROR?= yes
NOCLANGERROR?= yes
AFLAGS+= -D__ASSEMBLY__
CFLAGS+= -fno-builtin
# For C++ programs # For C++ programs
CPPFLAGS+= -I${DESTDIR}/usr/include/g++ CPPFLAGS+= -I${DESTDIR}/usr/include/g++
#LSC FIXME: Needed by clang for now
.if ${MACHINE_ARCH} == "i386"
CPUFLAGS+= -march=i586
.endif
# LSC MINIX SMP Support? # LSC MINIX SMP Support?
.ifdef CONFIG_SMP .ifdef CONFIG_SMP
SMP_FLAGS += -DCONFIG_SMP SMP_FLAGS += -DCONFIG_SMP