Changeset View
Changeset View
Standalone View
Standalone View
lang/ghc/files/patch-configure.ac
--- configure.ac.orig 2018-03-06 16:48:53 UTC | --- configure.ac.orig 2018-04-17 19:30:22 UTC | ||||
+++ configure.ac | +++ configure.ac | ||||
@@ -447,6 +447,9 @@ XCODE_VERSION() | @@ -447,6 +447,9 @@ XCODE_VERSION() | ||||
dnl ** Building a cross compiler? | dnl ** Building a cross compiler? | ||||
dnl -------------------------------------------------------------- | dnl -------------------------------------------------------------- | ||||
CrossCompiling=NO | CrossCompiling=NO | ||||
+ | + | ||||
+build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'` | +build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/armv[[67]]-/arm-/g; s/-freebsd.*$/-freebsd/g'` | ||||
+ | + | ||||
# If 'host' and 'target' differ, then this means we are building a cross-compiler. | # If 'host' and 'target' differ, then this means we are building a cross-compiler. | ||||
if test "$TargetPlatform" != "$HostPlatform" ; then | if test "$TargetPlatform" != "$HostPlatform" ; then | ||||
CrossCompiling=YES | CrossCompiling=YES | ||||
@@ -1163,6 +1158,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t | @@ -1163,6 +1158,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; t | ||||
# The flag MAP_NORESERVE is supported for source compatibility reasons, | # The flag MAP_NORESERVE is supported for source compatibility reasons, | ||||
# but is completely ignored by OS mmap | # but is completely ignored by OS mmap | ||||
use_large_address_space=no | use_large_address_space=no | ||||
+ elif test "$ghc_host_os" = "freebsd" ; then | + elif test "$ghc_host_os" = "freebsd" ; then | ||||
+ # FreeBSD does not support mmap with MAP_NORESERVE, removed in r273250. | + # FreeBSD does not support mmap with MAP_NORESERVE, removed in r273250. | ||||
arrowd: What's the difference between `AC_CHECK_TARGET_TOOL` and `AC_CHECK_TOOL`? Do you plan to… | |||||
Not Done Inline Actionsghc considers armv6 and armv7 as a single arch (called arm) and the configure script thinks that we are cross compiling and searches for cross compile tool. Build and target look like this: build : armv7-unknown-freebsd ; target : arm-unknown-freebsd mikael: ghc considers armv6 and armv7 as a single arch (called arm) and the configure script thinks… | |||||
+ # The flag MAP_NORESERVE is supported for source compatibility reasons, | + # The flag MAP_NORESERVE is supported for source compatibility reasons, | ||||
+ # but is completely ignored by OS mmap | + # but is completely ignored by OS mmap | ||||
+ use_large_address_space=no | + use_large_address_space=no | ||||
else | else | ||||
AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[], | AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[], | ||||
[ | [ | ||||
Not Done Inline ActionsJudging from configure.ac, these can be set with LLC and OPT env vars. arrowd: Judging from `configure.ac`, these can be set with `LLC` and `OPT` env vars. | |||||
Not Done Inline ActionsDidn't know that, many thanks! mikael: Didn't know that, many thanks! |
What's the difference between AC_CHECK_TARGET_TOOL and AC_CHECK_TOOL? Do you plan to upstream this too?