diff options
| author | Sergei Trofimovich <slyfox@community.haskell.org> | 2011-03-01 06:41:08 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@community.haskell.org> | 2011-03-01 06:41:08 +0000 |
| commit | c00ea87f79231fba729fd4e7de1279261044ce5f (patch) | |
| tree | c63defeb79ea1cedce711c8d79c104875212c4f6 /aclocal.m4 | |
| parent | 4b7d8ae0cdf92b0d8789676a4be89b41a4582472 (diff) | |
| download | haskell-c00ea87f79231fba729fd4e7de1279261044ce5f.tar.gz | |
configure: triplet: accept i486 CPU (and more), more vendors and OSes
Gentoo has interesting ports:
- freebsd with following triplet:
./configure --build=i686-gentoo-freebsd8 --host=i686-gentoo-freebsd8 --host=i686-gentoo-freebsd8
should be recognized as 'i386-unknown-freebsd'
- 'pc' vendor along with non-'i386' is very common:
./configure --build=i486-pc-linux-gnu --i486-pc-linux-gnu --host=i486-pc-linux-gnu
./configure --build=i686-pc-linux-gnu --i686-pc-linux-gnu --host=i686-pc-linux-gnu
should be recognized as 'i386-unknown-linux'
Patch adds:
- 'pc' vendor (maps to 'unknown')
- 'gentoo' vendor (maps to 'unknown')
- 'i486', 'i586', 'i686' CPUs (maps to 'i386')
- 'freebsd8' OS (maps to 'freebsd')
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index ae9e41ed34..1db95cf6b8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1458,7 +1458,7 @@ case "$1" in hppa*) $2="hppa" ;; - i386) + i386|i486|i586|i686) $2="i386" ;; ia64) @@ -1511,7 +1511,15 @@ case "$1" in # -------------------------------- # converts vendor from gnu to ghc naming, and assigns the result to $target_var AC_DEFUN([GHC_CONVERT_VENDOR],[ -$2="$1" + case "$1" in + pc|gentoo) # like i686-pc-linux-gnu and i686-gentoo-freebsd8 + $2="unknown" + ;; + *) + #pass thru by default + $2="$1" + ;; + esac ]) # GHC_CONVERT_OS(os, target_var) @@ -1526,6 +1534,9 @@ case "$1" in freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) $2="$1" ;; + freebsd8) # like i686-gentoo-freebsd8 + $2="freebsd" + ;; *) echo "Unknown OS $1" exit 1 |