[Git][ghc/ghc][wip/hadrian-cross-stage2] fix

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
0a73e7d3 by GHC GitLab CI at 2023-10-31T11:09:52+00:00
fix

- - - - -


2 changed files:

- configure.ac
- distrib/configure.ac.in


Changes:

=====================================
configure.ac
=====================================
@@ -402,6 +402,20 @@ then
 else
   TargetPlatformFull="${target_alias}"
 fi
+if test -z "${build_alias}"
+then
+  # --target wasn't given; use result from AC_CANONICAL_TARGET
+  BuildPlatformFull="${build}"
+else
+  BuildPlatformFull="${build_alias}"
+fi
+if test -z "${host_alias}"
+then
+  # --target wasn't given; use result from AC_CANONICAL_TARGET
+  HostPlatformFull="${host}"
+else
+  HostPlatformFull="${host_alias}"
+fi
 if test "$CrossCompiling" = "YES"
 then
   # Use value passed by user from --target=
@@ -412,6 +426,8 @@ fi
 AC_SUBST(CrossCompiling)
 AC_SUBST(CrossCompilePrefix)
 AC_SUBST(TargetPlatformFull)
+AC_SUBST(BuildPlatformFull)
+AC_SUBST(HostPlatformFull)
 
 dnl ** Which gcc to use?
 dnl --------------------------------------------------------------


=====================================
distrib/configure.ac.in
=====================================
@@ -11,14 +11,20 @@ AC_PREREQ([2.69])
 
 AC_CONFIG_MACRO_DIRS([../m4])
 
+dnl--------------------------------------------------------------------
+dnl * Deal with arguments telling us gmp is somewhere odd
+dnl--------------------------------------------------------------------
+
+build_alias=@BuildPlatformFull@
+host_alias=@HostPlatformFull@
+target_alias=@TargetPlatformFull@
+
 dnl this makes sure `./configure --target=<cross-compile-target>`
 dnl works as expected, since we're slightly modifying how Autoconf
 dnl interprets build/host/target and how this interacts with $CC tests
 test -n "$target_alias" && ac_tool_prefix=$target_alias-
 
-dnl--------------------------------------------------------------------
-dnl * Deal with arguments telling us gmp is somewhere odd
-dnl--------------------------------------------------------------------
+
 
 dnl Various things from the source distribution configure
 bootstrap_build=@BuildPlatform@



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a73e7d35acc703a70e0d45e0ac8c30757ea5893

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0a73e7d35acc703a70e0d45e0ac8c30757ea5893
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20231031/29db92e6/attachment-0001.html>