2020-02-25 21:25:57 +00:00
|
|
|
From b32e6fc3318a2d25d7ae233a8999beb752d6131d Mon Sep 17 00:00:00 2001
|
2019-04-26 08:37:35 +00:00
|
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
|
|
Date: Fri, 26 Apr 2019 16:16:29 +0100
|
2020-01-18 11:43:26 +00:00
|
|
|
Subject: [PATCH 3/5] configure: Remove incorrect assumption about
|
2019-04-26 08:37:35 +00:00
|
|
|
cross-compiling.
|
|
|
|
|
|
|
|
|
|
See https://github.com/ocaml/ocaml/issues/8647#issuecomment-487094390
|
|
|
|
|
---
|
2019-12-05 15:52:23 +00:00
|
|
|
configure.ac | 11 ++++++-----
|
|
|
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
2019-04-26 08:37:35 +00:00
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
2020-02-25 21:25:57 +00:00
|
|
|
index 0648f0553..ad07516e7 100644
|
2019-04-26 08:37:35 +00:00
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2020-01-18 11:43:26 +00:00
|
|
|
@@ -505,10 +505,11 @@ AS_IF(
|
2019-12-05 15:52:23 +00:00
|
|
|
|
|
|
|
|
# Are we building a cross-compiler
|
|
|
|
|
|
|
|
|
|
-AS_IF(
|
|
|
|
|
- [test x"$host" = x"$target"],
|
|
|
|
|
- [cross_compiler=false],
|
|
|
|
|
- [cross_compiler=true])
|
|
|
|
|
+#AS_IF(
|
|
|
|
|
+# [test x"$host" = x"$target"],
|
|
|
|
|
+# [cross_compiler=false],
|
|
|
|
|
+# [cross_compiler=true])
|
|
|
|
|
+cross_compiler=false
|
|
|
|
|
|
|
|
|
|
# Checks for programs
|
|
|
|
|
|
2020-01-18 11:43:26 +00:00
|
|
|
@@ -970,7 +971,7 @@ AS_IF([test $arch != "none" && $arch64 ],
|
2019-12-05 12:56:42 +00:00
|
|
|
|
|
|
|
|
# Assembler
|
2019-04-26 08:37:35 +00:00
|
|
|
|
2019-08-16 07:56:11 +00:00
|
|
|
-AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
|
|
|
|
|
+#AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
|
2019-04-26 08:37:35 +00:00
|
|
|
|
|
|
|
|
# We first compute default values for as and aspp
|
|
|
|
|
# If values have been given by the user then they take precedence over
|
|
|
|
|
--
|
2020-02-25 21:25:57 +00:00
|
|
|
2.25.0
|
2019-04-26 08:37:35 +00:00
|
|
|
|
