Changeset View
Changeset View
Standalone View
Standalone View
lang/ghc/files/patch-configure.ac
| --- configure.ac.orig 2017-01-04 14:17:17 UTC | --- configure.ac.orig 2018-03-06 16:48:53 UTC | ||||
| +++ configure.ac | +++ configure.ac | ||||
| @@ -418,6 +418,9 @@ AC_SUBST([SplitObjsBroken]) | @@ -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/-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 | ||||
| @@ -1057,6 +1060,11 @@ if test "$ac_cv_sizeof_void_p" -eq 8 ; then | @@ -798,14 +801,6 @@ AC_PATH_PROGS(PatchCmd,gpatch patch, pat | ||||
| use_large_address_space=yes | |||||
| elif test "$ghc_host_os" = "openbsd" ; then | dnl ** check for dtrace (currently only implemented for Mac OS X) | ||||
| # as of OpenBSD 5.8 (2015), OpenBSD does not support mmap with MAP_NORESERVE. | HaveDtrace=NO | ||||
| + # The flag MAP_NORESERVE is supported for source compatibility reasons, | -AC_PATH_PROG(DtraceCmd,dtrace) | ||||
| + # but is completely ignored by OS mmap | -if test -n "$DtraceCmd"; then | ||||
| + use_large_address_space=no | - if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" \ | ||||
| + elif test "$ghc_host_os" = "freebsd" ; then | - -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xfreebsd-portbld" \ | ||||
| + # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250. | - -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then | ||||
| - HaveDtrace=YES | |||||
| - fi | |||||
| -fi | |||||
| AC_SUBST(HaveDtrace) | |||||
| AC_PATH_PROG(HSCOLOUR,HsColour) | |||||
| @@ -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 | |||||
| + # FreeBSD does not support mmap with MAP_NORESERVE,r emoved in r273250. | |||||
| + # The flag MAP_NORESERVE is supported for source compatibility reasons, | |||||
| + # but is completely ignored by OS mmap | |||||
| + use_large_address_space=no | |||||
| else | |||||
| AC_CHECK_DECLS([MAP_NORESERVE, MADV_FREE, MADV_DONTNEED],[],[], | |||||
| [ | |||||