diff options
| author | Josh Meredith <joshmeredith2008@gmail.com> | 2019-12-04 23:39:28 +1100 |
|---|---|---|
| committer | Josh Meredith <joshmeredith2008@gmail.com> | 2019-12-04 23:39:28 +1100 |
| commit | a8435165b84c32fd2ebdd1281dd6ee077e07ad5a (patch) | |
| tree | 791936d014aeaa26174c2dcbef34c14f3329dd04 /configure.ac | |
| parent | 7805441b4d5e22eb63a501e1e40383d10380dc92 (diff) | |
| parent | f03a41d4bf9418ee028ecb51654c928b2da74edd (diff) | |
| download | haskell-wip/binary-readerT.tar.gz | |
Merge branch 'master' into wip/binary-readerTwip/binary-readerT
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 59541f002f..8d6ceb9e65 100644 --- a/configure.ac +++ b/configure.ac @@ -465,7 +465,7 @@ dnl ** Building a cross compiler? dnl -------------------------------------------------------------- CrossCompiling=NO # If 'host' and 'target' differ, then this means we are building a cross-compiler. -if test "$TargetPlatform" != "$HostPlatform" ; then +if test "$target" != "$host" ; then CrossCompiling=YES cross_compiling=yes # This tells configure that it can accept just 'target', # otherwise you get @@ -715,7 +715,9 @@ FP_GCC_SUPPORTS_NO_PIE dnl ** Used to determine how to compile ghc-prim's atomics.c, used by dnl unregisterised, Sparc, and PPC backends. FP_GCC_SUPPORTS__ATOMICS -AC_DEFINE([HAVE_C11_ATOMICS], [$CONF_GCC_SUPPORTS__ATOMICS], [Does GCC support __atomic primitives?]) +if test $CONF_GCC_SUPPORTS__ATOMICS = YES ; then + AC_DEFINE([HAVE_C11_ATOMICS], [1], [Does GCC support __atomic primitives?]) +fi FP_GCC_EXTRA_FLAGS |