From: Nick Downing Date: Tue, 3 Jan 2017 07:18:38 +0000 (+1100) Subject: Improved system build script (and individual build scripts for development) X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=87cb6212b6adc366ef9a65bbf5fe115fb60aaf8c;p=211bsd.git Improved system build script (and individual build scripts for development) --- diff --git a/bin/ar/Makefile b/bin/ar/Makefile index 897bc67..01d2fe0 100644 --- a/bin/ar/Makefile +++ b/bin/ar/Makefile @@ -1,7 +1,6 @@ # @(#)Makefile 5.8 (Berkeley) 3/10/91 -CFLAGS=-O -CPPFLAGS=-Iinclude -I. +CFLAGS=-O -Iinclude -I. SEPFLAG=-i SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \ diff --git a/bin/ar/n.sh b/bin/ar/n.sh index 239a041..7655be6 100755 --- a/bin/ar/n.sh +++ b/bin/ar/n.sh @@ -1,7 +1,8 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/bin\/ar$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/bin" mkdir --parents "$ROOT/cross/usr/man/cat1" mkdir --parents "$ROOT/cross/usr/man/cat5" -make SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/bin/as/n.sh b/bin/as/n.sh index 8f8a4af..99451e6 100755 --- a/bin/as/n.sh +++ b/bin/as/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/bin\/as$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/bin" -make SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/bin/cc/Makefile b/bin/cc/Makefile index 824e58c..6291502 100644 --- a/bin/cc/Makefile +++ b/bin/cc/Makefile @@ -2,8 +2,8 @@ # makefile for cc # +CFLAGS=-DCROSSDIR=\"${CROSSDIR}\" -DSTAGEDIR=\"${STAGEDIR}\" SEPFLAG=-i -CPPFLAGS=-DCROSSDIR=\"${CROSSDIR}\" -DSTAGEDIR=\"${STAGEDIR}\" all: cc diff --git a/bin/cc/n.sh b/bin/cc/n.sh index b24cc21..2128f5a 100755 --- a/bin/cc/n.sh +++ b/bin/cc/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/bin\/cc$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/bin" -make SEPFLAG= CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" DESTDIR="$ROOT/cross" install +make CC="$CC" CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/bin/ld/Makefile b/bin/ld/Makefile index a1dcdfc..5ee8a67 100644 --- a/bin/ld/Makefile +++ b/bin/ld/Makefile @@ -8,8 +8,7 @@ OBJS=ld.o ../../lib/libc/pdp/gen/nsym.o MAN=ld.0 MANSRC=ld.1 -CFLAGS=-O -CPPFLAGS=-Iinclude -I../ar -DSTAGEDIR=\"${STAGEDIR}\" -DNUM_VM_PAGES=20 +CFLAGS=-O -Iinclude -I../ar -DSTAGEDIR=\"${STAGEDIR}\" -DNUM_VM_PAGES=20 SEPFLAG=-i all: ld ld.0 diff --git a/bin/ld/n.sh b/bin/ld/n.sh index 9b83c2f..90a75b9 100755 --- a/bin/ld/n.sh +++ b/bin/ld/n.sh @@ -1,6 +1,7 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/bin\/ld$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/bin" mkdir --parents "$ROOT/cross/usr/man/cat1" -make SEPFLAG= DESTDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" LDFLAGS="-L$ROOT/cross/usr/lib" install +make CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG= LDFLAGS="-L$ROOT/cross/usr/lib" +make DESTDIR="$ROOT/cross" install diff --git a/bin/nm/Makefile b/bin/nm/Makefile index a63646b..c3c9beb 100644 --- a/bin/nm/Makefile +++ b/bin/nm/Makefile @@ -4,8 +4,7 @@ SRCS=nm.c ../../lib/libc/pdp/gen/nsym.c OBJS=nm.o ../../lib/libc/pdp/gen/nsym.o -CFLAGS=-O -CPPFLAGS=-Iinclude -I../ar +CFLAGS=-O -Iinclude -I../ar SEPFLAG=-i all: nm diff --git a/bin/nm/n.sh b/bin/nm/n.sh index ca20b5c..c046335 100755 --- a/bin/nm/n.sh +++ b/bin/nm/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/bin\/nm$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/bin" -make SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/lib/c2/n.sh b/lib/c2/n.sh index 3cbd619..e3c7332 100755 --- a/lib/c2/n.sh +++ b/lib/c2/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/lib\/c2$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/lib" -make SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/lib/ccom/c01.c b/lib/ccom/c01.c index 7e3e375..ee5dedf 100644 --- a/lib/ccom/c01.c +++ b/lib/ccom/c01.c @@ -356,7 +356,8 @@ void build(op) int op; { if (t==CHAR) t = INT; if (op==CAST) { - if (t!=DOUBLE && (t!=INT || p2->t.type!=CHAR || p2->t.type!=UNCHAR)) { + /* could the below be an oversight? gcc notes rhs always true */ + if (t!=DOUBLE /*&& (t!=INT || p2->t.type!=CHAR || p2->t.type!=UNCHAR)*/) { p2->t.type = t; p2->t.subsp = p1->t.subsp; p2->t.strp = p1->t.strp; diff --git a/lib/ccom/n.sh b/lib/ccom/n.sh index c837a3d..6de9868 100755 --- a/lib/ccom/n.sh +++ b/lib/ccom/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/lib\/ccom$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/lib" -make LDC0FLAGS= LDC1FLAGS= PURFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" LDC0FLAGS= LDC1FLAGS= PURFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile index 769a5eb..5a47269 100644 --- a/lib/cpp/Makefile +++ b/lib/cpp/Makefile @@ -1,8 +1,7 @@ # Makefile 1.3 (2.11BSD) 96/7/11 # -CPPFLAGS=-DSTAGEDIR=\"${STAGEDIR}\" -DFLEXNAMES -DTARGET_unix -DTARGET_pdp11 -DTARGET_BSD2_11 -CFLAGS=-O +CFLAGS=-O -DSTAGEDIR=\"${STAGEDIR}\" -DFLEXNAMES -DTARGET_unix -DTARGET_pdp11 -DTARGET_BSD2_11 SEPFLAG=-i cpp: cpp.o y.tab.o diff --git a/lib/cpp/n.sh b/lib/cpp/n.sh index 6742673..811749c 100755 --- a/lib/cpp/n.sh +++ b/lib/cpp/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/lib\/cpp$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/lib" -make SEPFLAG= DESTDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" install +make CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/lib/libc/n.sh b/lib/libc/n.sh index 0ccc7ac..62523fd 100755 --- a/lib/libc/n.sh +++ b/lib/libc/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/lib\/libc$//'`" mkdir --parents "$ROOT/stage/lib" -#make CC="$ROOT/cross/bin/cc" MKDEP="$ROOT/cross/usr/bin/mkdep" depend -make AR="$ROOT/cross/bin/ar" AS="$ROOT/cross/bin/as" CC="$ROOT/cross/bin/cc" CPP="$ROOT/cross/lib/cpp" LD="$ROOT/cross/bin/ld" LORDER="$ROOT/cross/usr/bin/lorder" RANLIB="$ROOT/cross/usr/bin/ranlib" DESTDIR="$ROOT/stage" install +make CC="$ROOT/cross/bin/cc" MKDEP="$ROOT/cross/usr/bin/mkdep" depend +make AR="$ROOT/cross/bin/ar" AS="$ROOT/cross/bin/as" CC="$ROOT/cross/bin/cc" CPP="$ROOT/cross/lib/cpp" LD="$ROOT/cross/bin/ld" LORDER="$ROOT/cross/usr/bin/lorder" +make RANLIB="$ROOT/cross/usr/bin/ranlib" DESTDIR="$ROOT/stage" install diff --git a/lib/libc/net/hosttable/Makefile b/lib/libc/net/hosttable/Makefile index 6f4c57f..ffe41fc 100644 --- a/lib/libc/net/hosttable/Makefile +++ b/lib/libc/net/hosttable/Makefile @@ -54,157 +54,6 @@ depend: # DO NOT DELETE THIS LINE -- make depend uses it - - - - - - - - - - - - - - - - - - -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/file.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/fcntl.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h -gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: gethostent.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/sys/socket.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/arpa/inet.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/netdb.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ctype.h -gethostent.o: /home/nick/src/211bsd.git/stage/usr/include/ndbm.h gethnamadr.o: gethnamadr.c /home/nick/src/211bsd.git/stage/usr/include/stdio.h gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/types.h gethnamadr.o: /home/nick/src/211bsd.git/stage/usr/include/sys/select.h diff --git a/n.sh b/n.sh index 82dd901..f69525b 100755 --- a/n.sh +++ b/n.sh @@ -1,6 +1,11 @@ #!/bin/sh + ROOT="`pwd`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" + +# set up to build cross toolchain +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" + +# create skeleton filesystem for cross toolchain mkdir --parents "$ROOT/cross/bin" mkdir --parents "$ROOT/cross/lib" mkdir --parents "$ROOT/cross/usr/bin" @@ -8,19 +13,59 @@ mkdir --parents "$ROOT/cross/usr/lib" mkdir --parents "$ROOT/cross/usr/man/cat1" mkdir --parents "$ROOT/cross/usr/man/cat3" mkdir --parents "$ROOT/cross/usr/man/cat5" + +# clean leftover files from other architecture +make clean + +# do /usr/lib/libvmf.a first, since ld needs it +make -C usr.lib/libvmf CC="$CC" +make -C usr.lib/libvmf DESTDIR="$ROOT/cross" install + +make -C bin/ar CC="$CC" SEPFLAG= +make -C bin/as CC="$CC" SEPFLAG= +make -C bin/cc CC="$CC" CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" SEPFLAG= +make -C bin/ld CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG= LDFLAGS="-L$ROOT/cross/usr/lib" +make -C bin/nm CC="$CC" SEPFLAG= +make -C lib/c2 CC="$CC" SEPFLAG= +make -C lib/ccom CC="$CC" LDC0FLAGS= LDC1FLAGS= PURFLAG= +make -C lib/cpp CC="$CC" STAGEDIR="$ROOT/stage" SEPFLAG= +make -C usr.bin CC="$ROOT/cross/bin/cc" NM="$ROOT/cross/bin/nm" lorder mkdep +make -C usr.bin/ranlib CC="$CC" SEPFLAG= + +make -C bin/ar DESTDIR="$ROOT/cross" install +make -C bin/as DESTDIR="$ROOT/cross" install +make -C bin/cc DESTDIR="$ROOT/cross" install +make -C bin/ld DESTDIR="$ROOT/cross" install +make -C bin/nm DESTDIR="$ROOT/cross" install +make -C lib/c2 DESTDIR="$ROOT/cross" install +make -C lib/ccom DESTDIR="$ROOT/cross" install +make -C lib/cpp DESTDIR="$ROOT/cross" install +install usr.bin/lorder -m 755 "$ROOT/cross/usr/bin" +install usr.bin/mkdep -m 755 "$ROOT/cross/usr/bin" +make -C usr.bin/ranlib DESTDIR="$ROOT/cross" install + +# now got cross toolchain installed, set up to build target +AR="$ROOT/cross/bin/ar" +AS="$ROOT/cross/bin/as" +CC="$ROOT/cross/bin/cc" +CPP="$ROOT/cross/lib/cpp" +LD="$ROOT/cross/bin/ld" +LORDER="$ROOT/cross/usr/bin/lorder" +MKDEP="$ROOT/cross/usr/bin/mkdep" +RANLIB="$ROOT/cross/usr/bin/ranlib" + +# create skeleton filesystem for target mkdir --parents "$ROOT/stage/lib" mkdir --parents "$ROOT/stage/usr/include" mkdir --parents "$ROOT/stage/usr/lib" + +# clean leftover files from other architecture make clean -make -C bin/ar SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C bin/as SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C bin/cc SEPFLAG= CROSSDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" DESTDIR="$ROOT/cross" install -make -C bin/ld SEPFLAG= DESTDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" LDFLAGS="-L$ROOT/cross/usr/lib" install -make -C bin/nm SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C include SHARED=copies DESTDIR="$ROOT/stage" SYSDIR="$ROOT/sys" install -make -C lib/c2 SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C lib/ccom LDC0FLAGS= LDC1FLAGS= PURFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C lib/cpp SEPFLAG= DESTDIR="$ROOT/cross" STAGEDIR="$ROOT/stage" CFLAGS="$CFLAGS" install -make -C usr.bin CC="$ROOT/cross/bin/cc" NM="$ROOT/cross/bin/nm" lorder mkdep && install usr.bin/lorder -m 755 "$ROOT/cross/usr/bin" && install usr.bin/mkdep -m 755 "$ROOT/cross/usr/bin" -make -C usr.bin/ranlib SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install -make -C usr.lib/libvmf DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install + +# do /usr/include first, since libc needs it +make -C include SHARED=copies SYSDIR="$ROOT/sys" DESTDIR="$ROOT/stage" install + +# do /lib/libc.a next, since everything needs it +make -C lib/libc CC="$CC" MKDEP="$MKDEP" depend +make -C lib/libc AR="$AR" AS="$AS" CC="$CC" CPP="$CPP" LD="$LD" LORDER="$LORDER" +make -C lib/libc RANLIB="$RANLIB" DESTDIR="$ROOT/stage" install diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile index ad48ad9..977d502 100644 --- a/usr.bin/ranlib/Makefile +++ b/usr.bin/ranlib/Makefile @@ -6,8 +6,7 @@ SRCS=../../bin/ar/archive.c build.c misc.c ranlib.c touch.c ../../lib/libc/pdp/gen/nsym.c OBJS=../../bin/ar/archive.o build.o misc.o ranlib.o touch.o ../../lib/libc/pdp/gen/nsym.o -CFLAGS=-O -CPPFLAGS=-Iinclude -I../../bin/ar +CFLAGS=-O -Iinclude -I../../bin/ar SEPFLAG=-i all: ranlib.0 ranlib.5.0 ranlib diff --git a/usr.bin/ranlib/n.sh b/usr.bin/ranlib/n.sh index 7f46e52..568ee8b 100755 --- a/usr.bin/ranlib/n.sh +++ b/usr.bin/ranlib/n.sh @@ -1,5 +1,6 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/usr\.bin\/ranlib$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/usr/bin" -make SEPFLAG= DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" SEPFLAG= +make DESTDIR="$ROOT/cross" install diff --git a/usr.lib/libvmf/n.sh b/usr.lib/libvmf/n.sh index a6b0c48..664167e 100755 --- a/usr.lib/libvmf/n.sh +++ b/usr.lib/libvmf/n.sh @@ -1,6 +1,7 @@ #!/bin/sh ROOT="`pwd |sed -e 's/\/usr\.lib\/libvmf$//'`" -CFLAGS="-Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-parentheses" +CC="cc -Wall -Wno-char-subscripts -Wno-deprecated-declarations -Wno-format -Wno-maybe-uninitialized -Wno-parentheses -Wno-unused-result" mkdir --parents "$ROOT/cross/usr/lib" mkdir --parents "$ROOT/cross/usr/man/cat3" -make DESTDIR="$ROOT/cross" CFLAGS="$CFLAGS" install +make CC="$CC" +make DESTDIR="$ROOT/cross" install