diff options
| author | Ryan Newton <rrnewton@gmail.com> | 2013-08-31 15:28:02 -0400 |
|---|---|---|
| committer | Ryan Newton <rrnewton@gmail.com> | 2013-08-31 15:28:02 -0400 |
| commit | e251a51a990c3a9c95dabab139d42ad69479f61c (patch) | |
| tree | 94243fe32bb64d0cab79074ef8de8cb3530d2973 /aclocal.m4 | |
| parent | 6fd60b2382efa357fe99fa017fd343db9724d43a (diff) | |
| parent | ea87014a7ad4454f18bb15f6f0ee4b6e61b148be (diff) | |
| download | haskell-e251a51a990c3a9c95dabab139d42ad69479f61c.tar.gz | |
Merge branch 'master' into atomics
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index d604cc08e0..7e555446a1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -25,7 +25,7 @@ AC_DEFUN([GHC_SELECT_FILE_EXTENSIONS], x86_64-apple-darwin) $3='.dylib' ;; - arm-apple-darwin10) + arm-apple-darwin10|i386-apple-darwin11) $2='.a' $3='.dylib' ;; @@ -103,7 +103,7 @@ AC_DEFUN([FPTOOLS_SET_PLATFORM_VARS], echo "Can't work out target platform" exit 1 fi - + TargetArch=`echo "$target" | sed 's/-.*//'` TargetVendor=`echo "$target" | sed -e 's/.*-\(.*\)-.*/\1/'` TargetOS=`echo "$target" | sed 's/.*-//'` @@ -464,6 +464,7 @@ AC_DEFUN([FP_SETTINGS], SettingsPerlCommand="$PerlCmd" SettingsDllWrapCommand="/bin/false" SettingsWindresCommand="/bin/false" + SettingsLibtoolCommand="libtool" SettingsTouchCommand='touch' if test -z "$LlcCmd" then @@ -490,6 +491,7 @@ AC_DEFUN([FP_SETTINGS], AC_SUBST(SettingsPerlCommand) AC_SUBST(SettingsDllWrapCommand) AC_SUBST(SettingsWindresCommand) + AC_SUBST(SettingsLibtoolCommand) AC_SUBST(SettingsTouchCommand) AC_SUBST(SettingsLlcCommand) AC_SUBST(SettingsOptCommand) @@ -1602,7 +1604,7 @@ then # optimistiaclly assume that it actually works properly. AC_DEFINE([USE_TIMER_CREATE], 1, [Define to 1 if we can use timer_create(CLOCK_PROCESS_CPUTIME_ID,...)]) else - AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)], + AC_CACHE_CHECK([for a working timer_create(CLOCK_REALTIME)], [fptools_cv_timer_create_works], [AC_TRY_RUN([ #include <stdio.h> @@ -1722,7 +1724,7 @@ out: [fptools_cv_timer_create_works=no]) ]) case $fptools_cv_timer_create_works in - yes) AC_DEFINE([USE_TIMER_CREATE], 1, + yes) AC_DEFINE([USE_TIMER_CREATE], 1, [Define to 1 if we can use timer_create(CLOCK_PROCESS_CPUTIME_ID,...)]);; esac fi @@ -1918,7 +1920,7 @@ AC_DEFUN([GHC_CONVERT_VENDOR],[ # converts os from gnu to ghc naming, and assigns the result to $target_var AC_DEFUN([GHC_CONVERT_OS],[ case "$1-$2" in - darwin10-arm) + darwin10-arm|darwin11-i386) $3="ios" ;; *) |