projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-12-10 01:27:59 by sebc]
[ghc-hetmet.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
0eda0d3
..
0e24d30
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-44,8
+44,7
@@
hardtop=`echo $hardtop | sed 's|^/tmp_mnt.*\(/local/.*\)$|\1|' | sed 's|^/tmp_mn
echo ''
echo "*** The top of your build tree is: $hardtop"
echo ''
echo "*** The top of your build tree is: $hardtop"
-AC_SUBST(hardtop)
-
+# subst of hardtop is done below after we've computed hardtop_plat.
dnl--------------------------------------------------------------------
dnl * Choose host(/target/build) platform
dnl--------------------------------------------------------------------
dnl * Choose host(/target/build) platform
@@
-267,15
+266,15
@@
powerpc-ibm-aix*)
HostVendor_CPP='ibm'
HostOS_CPP='aix'
;;
HostVendor_CPP='ibm'
HostOS_CPP='aix'
;;
-powerpc-apple-macosx*)
- HostPlatform=powerpc-apple-macosx
- TargetPlatform=powerpc-apple-macosx #hack
- BuildPlatform=powerpc-apple-macosx #hack
- HostPlatform_CPP='powerpc_apple_macosx'
- HostArch_CPP='powerpc'
- HostVendor_CPP='apple'
- HostOS_CPP='macosx'
- ;;
+powerpc-apple-darwin*)
+ HostPlatform=powerpc-apple-darwin
+ TargetPlatform=powerpc-apple-darwin #hack
+ BuildPlatform=powerpc-apple-darwin #hack
+ HostPlatform_CPP='powerpc_apple_darwin'
+ HostArch_CPP='powerpc'
+ HostVendor_CPP='apple'
+ HostOS_CPP='darwin'
+ ;;
sparc-sun-sunos4*)
HostPlatform=sparc-sun-sunos4
TargetPlatform=sparc-sun-sunos4 #hack
sparc-sun-sunos4*)
HostPlatform=sparc-sun-sunos4
TargetPlatform=sparc-sun-sunos4 #hack
@@
-339,18
+338,18
@@
AC_SUBST(exeext)
#
# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box).
#
# The native format for 'hardtop' (i.e., right kind of slashes on a Win32 box).
-#
+# (but with b-slashes being escaped).
case $HostPlatform in
case $HostPlatform in
- i386-unknown-mingw32)
- hardtop_plat=`cygpath -w ${hardtop}`
- ;;
- i386-unknown-cygwin32)
- hardtop_plat=`cygpath -w ${hardtop}`
+ i386-unknown-mingw32 | i386-unknown-cygwin32)
+ # get rid off /cygdrive/ prefix
+ hardtop=`echo ${hardtop} | sed -e 's%^/cygdrive/\(.\)/%\1:/%' `
+ hardtop_plat=`cygpath -w ${hardtop} | sed -e 's@\\\\@\\\\\\\\@g' `
;;
*)
hardtop_plat=${hardtop}
;;
esac
;;
*)
hardtop_plat=${hardtop}
;;
esac
+AC_SUBST(hardtop)
AC_SUBST(hardtop_plat)
dnl --------------------------------------------------------------
AC_SUBST(hardtop_plat)
dnl --------------------------------------------------------------