commit 10ff532fdcff507f0bc55be5faef3782cd2e595f from: wkj date: Tue Feb 22 16:58:04 2005 UTC Fix up OBJTYPE on 64-bit x86 FreeBSD machines. commit - 0f172593a39f8bea3c73c415ffe4600ad61e0bf2 commit + 10ff532fdcff507f0bc55be5faef3782cd2e595f blob - 4c890ed43a5a9ce02fc6a7062f06489251e70146 blob + 92cc6fa36089e4b6897acf6d30478494a4fd0021 --- src/Makefile +++ src/Makefile @@ -1,6 +1,6 @@ ../bin/mk: mkmk.sh 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; \ PLAN9=`pwd`/.. export PLAN9; \ sh -x mkmk.sh blob - 38ea8145778c67f08d788d1d5cfa5737f48f928a blob + aa428b200189af76d3d19a0e1a9e037a0ee7a988 --- src/mkhdr +++ src/mkhdr @@ -1,6 +1,7 @@ SYSNAME=`uname` OBJTYPE=`uname -m | sed ' s;i.86;386;; + s;amd64;x86_64;; s;/.*;;; s; ;;g; s;PowerMacintosh;power;g; blob - d2a73de038f15c0c3fb417d38f92e5a01c279017 blob + 516937e085d6e793876d82dbe4fa4c5a02227556 --- unix/make/Makefile.TOP +++ unix/make/Makefile.TOP @@ -5,7 +5,7 @@ OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; # this works in bsd make 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, # hence the gnu rules come first.