Skip to content

Commit 6c5bb6d

Browse files
committed
find-systype.sh: remove unused "systype" mechanism
The "systype" machanism is merely a system info gatherer, and the info it collects is (mostly) not used anywhere. The only seemingly important info is the kernel and kernel version (or the lack thereof), and has been moved to where it is used (print-ar.sh) This gets rid of two cross-incompatible buildtime programs. One tried to find if the build was happening on NeXT, but that's not an operating system that print-ar.sh cares about. The other tried to do cpuid on x86, which is useless to the build. This seems to implement what void-linux#11 started.
1 parent 66ec476 commit 6c5bb6d

File tree

8 files changed

+7
-204
lines changed

8 files changed

+7
-204
lines changed

src/Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ choose: choose.sh warn-auto.sh
179179
coe.o: coe.c coe.h compile
180180
./compile coe.c
181181

182-
compile: conf-cc print-cc.sh systype warn-auto.sh
182+
compile: conf-cc print-cc.sh warn-auto.sh
183183
rm -f compile
184184
sh print-cc.sh > compile
185185
chmod 555 compile
@@ -235,7 +235,7 @@ iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c
235235
iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h
236236
./compile iopause.c
237237

238-
load: conf-ld print-ld.sh systype warn-auto.sh
238+
load: conf-ld print-ld.sh warn-auto.sh
239239
rm -f load
240240
sh print-ld.sh > load
241241
chmod 555 load
@@ -246,7 +246,7 @@ lock_ex.o: compile hasflock.h lock.h lock_ex.c
246246
lock_exnb.o: compile hasflock.h lock.h lock_exnb.c
247247
./compile lock_exnb.c
248248

249-
makelib: print-ar.sh systype warn-auto.sh
249+
makelib: print-ar.sh warn-auto.sh
250250
rm -f makelib
251251
sh print-ar.sh > makelib
252252
chmod 555 makelib
@@ -358,10 +358,10 @@ subgetopt.o: compile subgetopt.c subgetopt.h
358358
./compile subgetopt.c
359359

360360
sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
361-
hassgprm.h haswaitp.h iopause.h load select.h systype \
361+
hassgprm.h haswaitp.h iopause.h load select.h \
362362
uint64.h reboot_system.h uw_tmp.h socket.lib
363363
rm -f sysdeps
364-
cat systype compile load socket.lib >>sysdeps
364+
cat compile load socket.lib >>sysdeps
365365
grep sysdep direntry.h >>sysdeps
366366
grep sysdep haswaitp.h >>sysdeps
367367
grep sysdep hassgact.h >>sysdeps
@@ -375,9 +375,6 @@ uint64.h reboot_system.h uw_tmp.h socket.lib
375375
grep sysdep uw_tmp.h >>sysdeps
376376
cat sysdeps
377377

378-
systype: find-systype.sh trycpp.c x86cpuid.c
379-
sh find-systype.sh > systype
380-
381378
tai_now.o: compile tai.h tai_now.c uint64.h
382379
./compile tai_now.c
383380

src/TARGETS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ strerr_die.o
106106
strerr_sys.o
107107
subgetopt.o
108108
sysdeps
109-
systype
110109
tai_now.o
111110
tai_pack.o
112111
tai_sub.o

src/find-systype.sh

Lines changed: 0 additions & 143 deletions
This file was deleted.

src/print-ar.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ cat warn-auto.sh
22
echo 'main="$1"; shift'
33
echo 'rm -f "$main"'
44
echo 'ar cr "$main" ${1+"$@"}'
5-
case "`cat systype`" in
5+
kern="$(uname -s | tr '/:[A-Z]' '..[a-z])')-$(uname -r | tr /: ..)" || kern="unknown"
6+
case $kern in
67
sunos-5.*) ;;
78
unix_sv*) ;;
89
irix64-*) ;;

src/print-cc.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
cc="`head -n1 conf-cc`"
2-
systype="`cat systype`"
32

43
cat warn-auto.sh
54
echo exec "$cc" '-c ${1+"$@"}'

src/print-ld.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
ld="`head -n1 conf-ld`"
2-
systype="`cat systype`"
32

43
cat warn-auto.sh
54
echo 'main="$1"; shift'

src/trycpp.c

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/x86cpuid.c

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)