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

Set MACHINE_ARCH and MACHINE_CPU to in NBSD libc Makefile

Browse source
This commit is contained in:
Gianluca Guida 2011-02-22 09:22:26 +00:00
parent 7193ee9890
commit dc75514afc
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/nbsd_libc/libcincludes.mk
View file

@ -4,6 +4,8 @@
# inside libc's include tree. # inside libc's include tree.
.if defined(__MINIX) .if defined(__MINIX)
MACHINE_ARCH= ${MACHINE}
MACHINE_CPU= ${MACHINE}
.if defined(LIBC_MACHINE_ARCH) && \ .if defined(LIBC_MACHINE_ARCH) && \
exists(${MINIXSRCDIR}/lib/nbsd_libc/arch/${LIBC_MACHINE_ARCH}/SYS.h) exists(${MINIXSRCDIR}/lib/nbsd_libc/arch/${LIBC_MACHINE_ARCH}/SYS.h)
ARCHSUBDIR= ${LIBC_MACHINE_ARCH} ARCHSUBDIR= ${LIBC_MACHINE_ARCH}

8
lib/nbsd_libc/minix-port.patch
View file

@ -1364,12 +1364,14 @@ diff -ru /home/netbsd/src/lib/libc/include/namespace.h ./include/namespace.h
diff -ru /home/netbsd/src/lib/libc/libcincludes.mk ./libcincludes.mk diff -ru /home/netbsd/src/lib/libc/libcincludes.mk ./libcincludes.mk
--- /home/netbsd/src/lib/libc/libcincludes.mk 2008-10-26 07:28:06.000000000 +0000 --- /home/netbsd/src/lib/libc/libcincludes.mk 2008-10-26 07:28:06.000000000 +0000
+++ ./libcincludes.mk 2011-02-21 12:57:21.000000000 +0000 +++ ./libcincludes.mk 2011-02-21 13:47:02.000000000 +0000
@@ -3,6 +3,22 @@ @@ -3,6 +3,24 @@
# Makefile fragment shared across several parts that want to look # Makefile fragment shared across several parts that want to look
# inside libc's include tree. # inside libc's include tree.
+.if defined(__MINIX) +.if defined(__MINIX)
+MACHINE_ARCH= ${MACHINE}
+MACHINE_CPU= ${MACHINE}
+.if defined(LIBC_MACHINE_ARCH) && \ +.if defined(LIBC_MACHINE_ARCH) && \
+ exists(${MINIXSRCDIR}/lib/nbsd_libc/arch/${LIBC_MACHINE_ARCH}/SYS.h) + exists(${MINIXSRCDIR}/lib/nbsd_libc/arch/${LIBC_MACHINE_ARCH}/SYS.h)
+ARCHSUBDIR= ${LIBC_MACHINE_ARCH} +ARCHSUBDIR= ${LIBC_MACHINE_ARCH}
@ -1388,7 +1390,7 @@ diff -ru /home/netbsd/src/lib/libc/libcincludes.mk ./libcincludes.mk
.if defined(LIBC_MACHINE_ARCH) && \ .if defined(LIBC_MACHINE_ARCH) && \
exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_ARCH}/SYS.h) exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_ARCH}/SYS.h)
ARCHSUBDIR= ${LIBC_MACHINE_ARCH} ARCHSUBDIR= ${LIBC_MACHINE_ARCH}
@@ -17,3 +33,4 @@ @@ -17,3 +35,4 @@
.endif .endif
ARCHDIR= ${NETBSDSRCDIR}/lib/libc/arch/${ARCHSUBDIR} ARCHDIR= ${NETBSDSRCDIR}/lib/libc/arch/${ARCHSUBDIR}