diff options
| author | obache <obache> | 2013-04-06 02:49:57 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-04-06 02:49:57 +0000 |
| commit | b742957195a62a9f70fd1003c5bb9f5e980591a4 (patch) | |
| tree | 668021dc1e1301bbbd7156c74beedd61d0ffcedc /devel | |
| parent | 0de4f9b6a1feb30a9005d0056021b47d4df0bccb (diff) | |
| download | pkgsrc-b742957195a62a9f70fd1003c5bb9f5e980591a4.tar.gz | |
prevent to force MACHINE_ARCH=i386 on Cygwin, for cygwin64.
Diffstat (limited to 'devel')
| -rwxr-xr-x | devel/bmake/files/machine.sh | 7 | ||||
| -rw-r--r-- | devel/bmake/files/os.sh | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/devel/bmake/files/machine.sh b/devel/bmake/files/machine.sh index 248428ca994..e99299aca65 100755 --- a/devel/bmake/files/machine.sh +++ b/devel/bmake/files/machine.sh @@ -2,7 +2,7 @@ # derrived from /etc/rc_d/os.sh # RCSid: -# $Id: machine.sh,v 1.6 2013/04/06 01:46:06 obache Exp $ +# $Id: machine.sh,v 1.7 2013/04/06 02:49:57 obache Exp $ # # @(#) Copyright (c) 1994-2002 Simon J. Gerraty # @@ -83,8 +83,9 @@ Linux) ;; CYGWIN_*) OS=Cygwin - MACHINE=i386 - MACHINE_ARCH=i386 + case "$machine" in + i?86) MACHINE_ARCH=i386;; + esac ;; esac diff --git a/devel/bmake/files/os.sh b/devel/bmake/files/os.sh index 22b6c477c86..4ed480bcd9c 100644 --- a/devel/bmake/files/os.sh +++ b/devel/bmake/files/os.sh @@ -17,7 +17,7 @@ # Simon J. Gerraty <sjg@crufty.net> # RCSid: -# $Id: os.sh,v 1.5 2010/09/07 14:28:00 joerg Exp $ +# $Id: os.sh,v 1.6 2013/04/06 02:49:57 obache Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -190,6 +190,11 @@ Haiku) BePC) MACHINE_ARCH=i386;; esac ;; +CYGWIN_*) + case $MACHINE in + i?86) MACHINE_ARCH=i386;; + esac + ;; esac HOSTNAME=${HOSTNAME:-`( hostname ) 2>/dev/null`} |