Commit b09bf4b0 authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari

configure.ac: Ensure that we handle case of non-present --target

@rwbarton pointed out that this could be an issue during review, but I
assumed from my point sample of three test builds that this wouldn't be
necessary.  Sadly, none of these builds were on Windows, which indeed
does fail.

Strangely, only Simon and Harbormaster have been able to replicate the
issue (which apparently manifests as libffi thinking it's building for
unix).  I've been completely unable to replicate the failure in my own
builds, neither locally nor on the Harbormaster machine.

Test Plan: Validate on Windows

Reviewers: austin, Phyx, hvr

Reviewed By: Phyx

Subscribers: thomie, rwbarton, erikd

Differential Revision: https://phabricator.haskell.org/D3304
parent 37a415e2
......@@ -446,7 +446,13 @@ fi
# all be taken care of for us if we configured the subprojects using
# AC_CONFIG_DIR, but unfortunately Cabal needs to be the one to do the
# configuration.
TargetPlatformFull="${target_alias}"
if test -z "${target_alias}"
then
# --target wasn't given; use result from AC_CANONICAL_TARGET
TargetPlatformFull="${target}"
else
TargetPlatformFull="${target_alias}"
fi
AC_SUBST(CrossCompiling)
AC_SUBST(CrossCompilePrefix)
AC_SUBST(TargetPlatformFull)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment