cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-24 11:41:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up OBJTYPE on 64-bit x86 FreeBSD machines.

Browse source
This commit is contained in:
wkj 2005-02-22 16:58:04 +00:00
parent 0f172593a3
commit 10ff532fdc
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile
View file

@ -1,6 +1,6 @@
../bin/mk: mkmk.sh ../bin/mk: mkmk.sh
SYSNAME=`uname` export SYSNAME; \ SYSNAME=`uname` export SYSNAME; \
OBJTYPE=`uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \ OBJTYPE=`uname -m | sed 's;i.86;386;; s;amd64;x86_64;; s;/.*;;; s; ;;g; s/PowerMacintosh/power/; s/ppc64/power/g; s/ppc/power/g'` export OBJTYPE; \
PATH=`pwd`/../bin:$$PATH export PATH; \ PATH=`pwd`/../bin:$$PATH export PATH; \
PLAN9=`pwd`/.. export PLAN9; \ PLAN9=`pwd`/.. export PLAN9; \
sh -x mkmk.sh sh -x mkmk.sh

1
src/mkhdr
View file

@ -1,6 +1,7 @@
SYSNAME=`uname` SYSNAME=`uname`
OBJTYPE=`uname -m | sed ' OBJTYPE=`uname -m | sed '
s;i.86;386;; s;i.86;386;;
s;amd64;x86_64;;
s;/.*;;; s;/.*;;;
s; ;;g; s; ;;g;
s;PowerMacintosh;power;g; s;PowerMacintosh;power;g;

2
unix/make/Makefile.TOP
View file

@ -5,7 +5,7 @@ OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'}
# this works in bsd make # this works in bsd make
SYSNAME!=uname SYSNAME!=uname
OBJTYPE!=uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g' OBJTYPE!=uname -m | sed 's;i.86;386;; s;amd64;x864_64;; s;/.*;;; s; ;;g'
# the gnu rules will mess up bsd but not vice versa, # the gnu rules will mess up bsd but not vice versa,
# hence the gnu rules come first. # hence the gnu rules come first.