projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added forgotten ./compiler/cmm/CmmLive.hs
[ghc-hetmet.git]
/
distrib
/
configure-bin.ac
diff --git
a/distrib/configure-bin.ac
b/distrib/configure-bin.ac
index
bccef9c
..
0d01388
100644
(file)
--- a/
distrib/configure-bin.ac
+++ b/
distrib/configure-bin.ac
@@
-5,7
+5,7
@@
dnl
#
# Is it there?
#
# Is it there?
-AC_INIT(Makefile.in)
+AC_INIT(Makefile-vars.in)
exeext=''
exeext=''
@@
-60,6
+60,8
@@
i[[3456]]86-*-mingw32*)
CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
TargetPlatform=i386-unknown-mingw32
;;
CFLAGS="-mno-cygwin -mwin32 $CFLAGS"
TargetPlatform=i386-unknown-mingw32
;;
+i[[3456]]86-apple-darwin*)
+ TargetPlatform=i386-apple-darwin;;
m68k-next-nextstep2)
TargetPlatform=m68k-next-nextstep2;;
m68k-next-nextstep3)
m68k-next-nextstep2)
TargetPlatform=m68k-next-nextstep2;;
m68k-next-nextstep3)
@@
-78,6
+80,10
@@
rs6000-ibm-aix*)
TargetPlatform=rs6000-ibm-aix;;
powerpc-apple-darwin*)
TargetPlatform=powerpc-apple-darwin;;
TargetPlatform=rs6000-ibm-aix;;
powerpc-apple-darwin*)
TargetPlatform=powerpc-apple-darwin;;
+powerpc-*-linux*)
+ TargetPlatform=powerpc-unknown-linux;;
+powerpc64-*-linux*)
+ TargetPlatform=powerpc64-unknown-linux;;
sparc-sun-sunos4*)
TargetPlatform=sparc-sun-sunos4;;
sparc-sun-solaris2*)
sparc-sun-sunos4*)
TargetPlatform=sparc-sun-sunos4;;
sparc-sun-solaris2*)
@@
-90,6
+96,8
@@
x86_64-*-openbsd*)
TargetPlatform=x86_64-unknown-openbsd;;
x86_64-*-netbsd*)
TargetPlatform=x86_64-unknown-netbsd;;
TargetPlatform=x86_64-unknown-openbsd;;
x86_64-*-netbsd*)
TargetPlatform=x86_64-unknown-netbsd;;
+x86_64-apple-darwin*)
+ TargetPlatform=x86_64-apple-darwin;;
*)
echo "Unrecognised platform: $TargetPlatform"
exit 1
*)
echo "Unrecognised platform: $TargetPlatform"
exit 1
@@
-100,6
+108,8
@@
echo "Which we'll further canonicalise into: $TargetPlatform"
AC_SUBST(TargetPlatform)
AC_SUBST(exeext)
AC_SUBST(TargetPlatform)
AC_SUBST(exeext)
+FP_FIND_ROOT
+
#
dnl ** Check Perl installation **
#
#
dnl ** Check Perl installation **
#
@@
-122,6
+132,11
@@
dnl ** how to do symlinks **
AC_PROG_LN_S()
#
AC_PROG_LN_S()
#
+dnl ** how to invoke `ar' and `ranlib'
+#
+FP_PROG_AR_NEEDS_RANLIB
+
+#
dnl ** Find the path to sed **
#
AC_PATH_PROG(SedCmd,sed)
dnl ** Find the path to sed **
#
AC_PATH_PROG(SedCmd,sed)
@@
-133,7
+148,7
@@
FP_HAVE_GCC
AC_PROG_CPP
#
AC_PROG_CPP
#
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile-vars)
echo "****************************************************"
echo "Configuration done, ready to either 'make install'"
echo "****************************************************"
echo "Configuration done, ready to either 'make install'"