diff options
| author | wkj <devnull@localhost> | 2005-02-22 16:58:04 +0000 |
|---|---|---|
| committer | wkj <devnull@localhost> | 2005-02-22 16:58:04 +0000 |
| commit | 10ff532fdcff507f0bc55be5faef3782cd2e595f (patch) | |
| tree | 240a2c81731643d4fe5fa30e1051e86a453b7d15 | |
| parent | 0f172593a39f8bea3c73c415ffe4600ad61e0bf2 (diff) | |
| download | plan9port-10ff532fdcff507f0bc55be5faef3782cd2e595f.tar.gz plan9port-10ff532fdcff507f0bc55be5faef3782cd2e595f.tar.bz2 plan9port-10ff532fdcff507f0bc55be5faef3782cd2e595f.zip | |
Fix up OBJTYPE on 64-bit x86 FreeBSD machines.
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/mkhdr | 1 | ||||
| -rw-r--r-- | unix/make/Makefile.TOP | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 4c890ed4..92cc6fa3 100644 --- a/src/Makefile +++ b/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 @@ -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; diff --git a/unix/make/Makefile.TOP b/unix/make/Makefile.TOP index d2a73de0..516937e0 100644 --- a/unix/make/Makefile.TOP +++ b/unix/make/Makefile.TOP @@ -5,7 +5,7 @@ OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'} # 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. |