ref: b76e8ecc732cb311ceee6fd6c807b7e784d3fe31
parent: 1fb9858663c3c5fd7bd59727103e290aab96bd74
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Sat Sep 14 10:15:14 EDT 2019
fix cross compilation by building table generation utilities under objtype=$cputype
--- a/sys/src/ape/X11/lib/X11/src/mkfile
+++ b/sys/src/ape/X11/lib/X11/src/mkfile
@@ -379,7 +379,7 @@
XKBleds.$O\
CLEANFILES=\
- $O.makekeys\
+ $cputype.makekeys\
ks_tables.h\
</sys/src/cmd/mksyslib
@@ -398,10 +398,10 @@
%.$O: xkb/%.c
$CC $CFLAGS xkb/$stem.c
-ks_tables.h: $O.makekeys
- ./$O.makekeys < /sys/include/ape/X11/keysymdef.h > ks_tables.h
+ks_tables.h:D: $cputype.makekeys
+ ./$cputype.makekeys < /sys/include/ape/X11/keysymdef.h > ks_tables.h
-$O.makekeys: util/makekeys.c
- $CC -B -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
+$cputype.makekeys: util/makekeys.c
+ objtype=$cputype $CC -B -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
StrKeysym.$O KeysymStr.$O: ks_tables.h
--- a/sys/src/ape/X11/lib/Xt/mkfile
+++ b/sys/src/ape/X11/lib/Xt/mkfile
@@ -61,7 +61,7 @@
StringDefs.$O\
CLEANFILES=\
- $O.makestrs\
+ $cputype.makestrs\
StringDefs.c\
</sys/src/cmd/mksyslib
@@ -68,8 +68,8 @@
CFLAGS=-c $X11CFLAGS -I. -I/sys/include/ape/X11
-StringDefs.c: $O.makestrs
- ./$O.makestrs -i . < util/string.list > StringDefs.c
+StringDefs.c:D: $cputype.makestrs util/string.list
+ ./$cputype.makestrs -i . < util/string.list > StringDefs.c
-$O.makestrs: util/makestrs.c
- $CC -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
+$cputype.makestrs: util/makestrs.c
+ objtype=$cputype $CC -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
--- a/sys/src/ape/X11/lib/lbxutil/mkfile
+++ b/sys/src/ape/X11/lib/lbxutil/mkfile
@@ -18,7 +18,7 @@
reqstats.$O\
CLEANFILES=\
- $O.mkg3states\
+ $cputype.mkg3states\
g3states.h\
</sys/src/cmd/mksyslib
@@ -34,10 +34,10 @@
%.$O: lbx_zlib/%.c
$CC $CFLAGS lbx_zlib/$stem.c
-g3states.h: $O.mkg3states
- ./$O.mkg3states -c > g3states.h
+g3states.h:D: $cputype.mkg3states
+ ./$cputype.mkg3states -c > g3states.h
-$O.mkg3states: image/mkg3states.c
- $CC -B -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
+$cputype.mkg3states: image/mkg3states.c
+ objtype=$cputype $CC -B -D_POSIX_SOURCE -D_BSD_EXTENSION -o $target $prereq
dfaxg42d.$O: g3states.h
--
⑨