sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefile fixups for cross compilation

Browse source
This commit is contained in:
Dirk Vogt 2012-05-01 16:09:06 +02:00 committed by Thomas Veerman
parent c2c39af6bb
commit c735b0bb2c
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/Makefile
View file

@ -15,12 +15,12 @@ CFLAGS += -D__kernel__
CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE CPPFLAGS+= -fno-stack-protector -D_NETBSD_SOURCE
LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds LDFLAGS+= -T ${.CURDIR}/arch/${ARCH}/kernel.lds
LDFLAGS+= -nostdlib -L${LIBDIR} LDFLAGS+= -nostdlib -L${DESTDIR}/${LIBDIR}
LDADD+= -lminlib LDADD+= -lminlib
DPADD+= ${LIBMINLIB} DPADD+= ${LIBMINLIB}
.if ${CC} == "gcc" .if !empty(CC:M*gcc)
LDADD+= -lgcc -lsys -lgcc -lminc LDADD+= -lgcc -lsys -lgcc -lminc
.elif ${CC} == "clang" .elif !empty(CC:M*clang)
LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic -lminc LDADD+= -L/usr/pkg/compiler-rt/lib -lCompilerRT-Generic -lsys -lCompilerRT-Generic -lminc
DPADD+= ${LIBC} DPADD+= ${LIBC}
.endif .endif

4
man/Makefile
View file

@ -7,8 +7,8 @@ WHATISDBDIR?= /usr/man
makedb: makedb:
${TOOL_MAKEWHATIS} ${DESTDIR}${WHATISDBDIR} ${TOOL_MAKEWHATIS} ${DESTDIR}${WHATISDBDIR}
.if ${MKUNPRIVED} != "no" .if ${MKUNPRIVED} != "no"
echo ".${WHATISDBDIR}/whatis.db type=file mode=0444 uname=${BINOWN} gname=${BINGRP}" \ # echo ".${WHATISDBDIR}/whatis.db type=file mode=0444 uname=${BINOWN} gname=${BINGRP}" \
| ${METALOG.add} # | ${METALOG.add}
.endif .endif
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

2
sys/arch/i386/stand/boot/Makefile.boot
View file

@ -34,7 +34,7 @@ BINMODE=444
.PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib .PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib
LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start -L${DESTDIR}/${LIBDIR}
CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
CPPFLAGS+= -I ${.OBJDIR} CPPFLAGS+= -I ${.OBJDIR}
# Make sure we override any optimization options specified by the user # Make sure we override any optimization options specified by the user

4
sys/arch/i386/stand/bootxx/Makefile.bootxx
View file

@ -39,7 +39,7 @@ BINMODE=444
.PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib .PATH: ${.CURDIR}/.. ${.CURDIR}/../../lib
LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,start LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,start -L${DESTDIR}/${LIBDIR}
CPPFLAGS+= -DBOOTXX CPPFLAGS+= -DBOOTXX
# CPPFLAGS+= -D__daddr_t=int32_t # CPPFLAGS+= -D__daddr_t=int32_t
CPPFLAGS+= -I ${.CURDIR}/../../lib -I ${.OBJDIR} CPPFLAGS+= -I ${.CURDIR}/../../lib -I ${.OBJDIR}
@ -52,7 +52,7 @@ CPPFLAGS+= -DXXfs_read=${FS}_read
CPPFLAGS+= -DXXfs_stat=${FS}_stat CPPFLAGS+= -DXXfs_stat=${FS}_stat
CPPFLAGS+= -DFS=${FS} CPPFLAGS+= -DFS=${FS}
# clang generates too big bootxx_xxx # clang generates too big bootxx_xxx
.if (${CC} == "clang") .if !empty(CC:M*clang)
CPPFLAGS+= -Os CPPFLAGS+= -Os
.endif .endif
# CPPFLAGS+= -DBOOT_MSG_COM0 # CPPFLAGS+= -DBOOT_MSG_COM0