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

make, lib changes to make gcc/clang format libraries in /usr/lib instead of /usr/gnu/lib.

Browse source
This commit is contained in:
Ben Gras 2010-09-13 16:37:02 +00:00
parent 23311d9819
commit eaa37fd21c
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/mtree/minix.tree
View file

@ -68,8 +68,6 @@
755 root operator /var
/var/log -> /usr/log
755 root operator /usr/log
755 root operator /usr/gnu
755 root operator /usr/gnu/lib
755 root operator /usr/var
755 root operator /usr/var/db
755 root operator /usr/var/db/pkg

2
kernel/Makefile
View file

@ -17,7 +17,7 @@ LDFLAGS+= -.o
.elif ${COMPILER_TYPE} == "gnu"
CPPFLAGS+= -ffreestanding -fno-stack-protector
LDFLAGS+= -T arch/${ARCH}/kernel.lds
LDFLAGS+= -nostdlib -L/usr/gnu/lib
LDFLAGS+= -nostdlib -L/usr/lib
CFLAGS+=-march=i386
DPADD+= ${LIBC}
LDADD+= -lc

2
share/mk/bsd.own.mk
View file

@ -474,7 +474,7 @@ INFOMODE?= ${NONBINMODE}
.if ${COMPILER_TYPE} == "ack"
LIBDIR?= /usr/lib/i386
.elif ${COMPILER_TYPE} == "gnu"
LIBDIR?= /usr/gnu/lib
LIBDIR?= /usr/lib
.endif
LINTLIBDIR?= /usr/libdata/lint

2
share/mk/bsd.prog.mk
View file

@ -63,7 +63,7 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
.if ${COMPILER_TYPE} == "ack"
LIB${_lib:tu}= ${DESTDIR}/usr/lib/i386/lib${_lib}.a
.elif ${COMPILER_TYPE} == "gnu"
LIB${_lib:tu}= ${DESTDIR}/usr/gnu/lib/lib${_lib}.a
LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
.endif
.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
.endif