84 lines
3 KiB
Diff
84 lines
3 KiB
Diff
|
From 7acd97746d8c41a191d5de96b03c915a52bdc142 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Hym <samuel@tarides.com>
|
||
|
|
Date: Wed, 21 Feb 2024 19:05:44 +0100
|
||
|
|
Subject: [PATCH 04/14] Use `target` instead of `host` when relevant in
|
||
|
|
configuration
|
||
|
|
|
||
|
|
---
|
||
|
|
configure | Bin 682949 -> 682314 bytes
|
||
|
|
configure.ac | 10 +++++-----
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure b/configure
|
||
|
|
index f81f4ca213b710395b61b64d1380318d4d80867d..b393e6e2871a942e0171f1a52b70f75ef74f780a 100755
|
||
|
|
GIT binary patch
|
||
|
|
delta 382
|
||
|
|
zcmX?lUGvl>&4w+Esyn8O?`5>&ElDg&Pc4a0%*jkF)}0=(m(dngX#2w*j4@28V$(0M
|
||
|
|
zFi)HQa5v-Y=?MmGT+?stVdP~=$<Irj{%#MW)bze%Osaee3W>?_$tCeVF19K@F4I5U
|
||
|
|
zVH4S|wwG}+i@bsYNDL;+rJ#_SQ=AH<z~V|u?J|cMftU%1nSq!Eh*`JG9A>lQVFkN&
|
||
|
|
zd+d3(9Zb`AtYPEdu5^hlt_dpK9K!A)Jbhvrvm8H)pK?;B8!l!t#SnCS!Z>65{|xr~
|
||
|
|
zjHsTQ{82+<`h?qz72E5w*?AbJD}82^n9fto&NY2~4m&5<bJMrwu**-sypuzI`==cC
|
||
|
|
lc9!X9irD2v;oflZ403f20r?#0n-@jwK+LiIMG@!S9{?!sjgSBU
|
||
|
|
|
||
|
|
delta 381
|
||
|
|
zcmX?gN%QD+&4w+Esyn7TJYqDNF0+@BW4qyXCI!arVLKW3Fi!t`mUYSWt-BdtPv5V}
|
||
|
|
z#xs4@9!B2j$BUW7r=Q%z$ithM9G_eg@8e>t;^V@#oqI3i7MAJ%DwqU?d|Z?iY!xc3
|
||
|
|
z6-qKv^SBg%VETPAHnr*ftC>otpS{Z3$pg{^)82mXAR`bn0WmWWvj8#c_In4}?0BaC
|
||
|
|
zv|{Jou6>Se9n<t*+u3=iIdigZe|v!~vT1tx4OZUmp~38S!XT%sPEW|?&|}I;nO^vu
|
||
|
|
z(R6x$1G4~#Gw~whjO}yM+3zz7R0C}*$<NP;FDOb)%dDuK{82+<`+`jN7RKoxPBY0&
|
||
|
|
zx6Ni3l7hI%#WTp&IRxx4ICJ{N+l&g^H)XT8vrNy=U>1^xsX_NBR0pbmyQbR|u*<X;
|
||
|
|
P6tDv^$M%8(&RahKk>QYK
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 0862b381ff..26de5bed24 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -597,7 +597,7 @@ AS_IF([test x"$enable_ocamldoc" = "xno"],
|
||
|
|
# Initialization of libtool
|
||
|
|
# Allow the MSVC linker to be found even if ld isn't installed.
|
||
|
|
# User-specified LD still takes precedence.
|
||
|
|
-AC_CHECK_TOOLS([LD],[ld link])
|
||
|
|
+AC_CHECK_TARGET_TOOLS([LD],[ld link])
|
||
|
|
# libtool expects host_os=mingw for native Windows
|
||
|
|
# Also, it has been observed that, on some platforms (e.g. msvc) LT_INIT
|
||
|
|
# alters the CFLAGS variable, so we save its value before calling the macro
|
||
|
|
@@ -1027,7 +1027,7 @@ AS_CASE([$flexdll_source_dir,$supports_shared_libraries,$flexlink,$host],
|
||
|
|
|
||
|
|
mkexe_cmd_exp="$CC"
|
||
|
|
|
||
|
|
-AS_CASE([$ocaml_cc_vendor,$host],
|
||
|
|
+AS_CASE([$ocaml_cc_vendor,$target],
|
||
|
|
[*,x86_64-*-darwin*],
|
||
|
|
[oc_ldflags='-Wl,-no_compact_unwind';
|
||
|
|
AC_DEFINE([HAS_ARCH_CODE32], [1])],
|
||
|
|
@@ -1045,7 +1045,7 @@ AS_CASE([$ocaml_cc_vendor,$host],
|
||
|
|
)
|
||
|
|
ostype="Cygwin"],
|
||
|
|
[*,*-*-mingw32*],
|
||
|
|
- [AS_CASE([$host],
|
||
|
|
+ [AS_CASE([$target],
|
||
|
|
[i686-*-*], [oc_dll_ldflags="-static-libgcc"])
|
||
|
|
ostype="Win32"
|
||
|
|
toolchain="mingw"
|
||
|
|
@@ -1342,7 +1342,7 @@ system=unknown
|
||
|
|
# preserving $arch = 'none' <=> $system = 'unknown'
|
||
|
|
has_native_backend=no
|
||
|
|
native_ldflags=""
|
||
|
|
-AS_CASE([$host],
|
||
|
|
+AS_CASE([$target],
|
||
|
|
[[i[3456]86-*-linux*]],
|
||
|
|
[arch=i386; system=linux],
|
||
|
|
[[i[3456]86-*-freebsd*]],
|
||
|
|
@@ -1479,7 +1479,7 @@ AS_IF([$natdynlink],
|
||
|
|
|
||
|
|
AC_DEFINE_UNQUOTED([OCAML_OS_TYPE], ["$ostype"])
|
||
|
|
|
||
|
|
-AC_CHECK_TOOL([DIRECT_LD],[ld])
|
||
|
|
+AC_CHECK_TARGET_TOOL([DIRECT_LD],[ld])
|
||
|
|
AS_IF([test -z "$PARTIALLD"],
|
||
|
|
[AS_CASE(["$host,$ocaml_cc_vendor"],
|
||
|
|
[x86_64-*-darwin*,gcc-*], [PACKLD_FLAGS=' -arch x86_64'],
|
||
|
|
--
|
||
|
|
2.45.2
|
||
|
|
|