Annotation of /trunk/ghc/patches/ghc-6.12.2-chost-2.patch
Parent Directory | Revision Log
Revision 1042 -
(hide annotations)
(download)
Wed May 5 17:47:36 2010 UTC (14 years, 4 months ago) by niro
File size: 1436 byte(s)
Wed May 5 17:47:36 2010 UTC (14 years, 4 months ago) by niro
File size: 1436 byte(s)
fixed vendor too
1 | niro | 1042 | --- ghc-6.12.2/configure.ac 2010-04-20 20:10:05.000000000 +0200 |
2 | +++ ghc-6.12.2-magellan/configure.ac 2010-05-05 19:49:17.000000000 +0200 | ||
3 | @@ -217,6 +217,9 @@ | ||
4 | echo "Bootstrapping GHC is a cross compiler. This probably isn't going to work" | ||
5 | fi | ||
6 | fi | ||
7 | +build=`echo "$build" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` | ||
8 | +[build=`echo "$build" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket | ||
9 | +echo "debug build=$build" | ||
10 | |||
11 | # We have to run these unconditionally, but we may discard their | ||
12 | # results in the following code | ||
13 | @@ -250,6 +253,9 @@ | ||
14 | GHC_CONVERT_VENDOR([$build_vendor], [BuildVendor]) | ||
15 | GHC_CONVERT_OS([$build_os], [BuildOS]) | ||
16 | fi | ||
17 | +host=`echo "$host" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` | ||
18 | +[host=`echo "$host" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket | ||
19 | +echo "debug: host=$host" | ||
20 | |||
21 | if test "$host_alias" = "" | ||
22 | then | ||
23 | @@ -270,6 +276,9 @@ | ||
24 | GHC_CONVERT_VENDOR([$host_vendor], [HostVendor]) | ||
25 | GHC_CONVERT_OS([$host_os], [HostOS]) | ||
26 | fi | ||
27 | +target=`echo "$target" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` | ||
28 | +[target=`echo "$target" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket | ||
29 | +echo "debug target=$target" | ||
30 | |||
31 | if test "$target_alias" = "" | ||
32 | then | ||
33 | @@ -332,7 +341,7 @@ | ||
34 | |||
35 | checkVendor() { | ||
36 | case $1 in | ||
37 | - dec|unknown|hp|apple|next|sun|sgi|ibm) | ||
38 | + dec|unknown|hp|apple|next|sun|sgi|ibm|pc) | ||
39 | ;; | ||
40 | *) | ||
41 | echo "Unknown vendor $1" |