summarylogtreecommitdiffstats
path: root/0058-Revert-meson-check-mtls-if-has_exe_wrapper.patch
blob: 2d753fafe69382de9cd0361b3ca0132bd0eb8c04 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
From af02f6c3a18f39b4869a625ec3b51f9f562e3861 Mon Sep 17 00:00:00 2001
From: Brendan King <Brendan.King@imgtec.com>
Date: Fri, 29 Apr 2022 14:48:06 +0100
Subject: [PATCH] Revert "meson: check -mtls if has_exe_wrapper"

This reverts commit 558bc2227ed00fc6a29c2a10c0b99719cd445c6c.

The change breaks 32 bit x86 cross compilation on x86_64 systems, as
meson.has_exe_wrapper returns true, but Meson fails with:

    Build machine cpu family: x86_64
    Build machine cpu: x86_64
    Host machine cpu family: x86
    Host machine cpu: i686
    Target machine cpu family: x86
    Target machine cpu: i686
    Checking if "thread_local" compiles: YES

    meson.build:555:4: ERROR: Can not run test applications in this
    cross environment.

See also https://github.com/mesonbuild/meson/issues/9845

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 31b6ffd..63d487a 100644
--- a/meson.build
+++ b/meson.build
@@ -550,7 +550,7 @@ endforeach
 if not have_mtls_dialect
   # need .run to check libc support. meson aborts when calling .run when
   # cross-compiling, but because this is just an optimization we can skip it
-  if meson.is_cross_build() and not meson.has_exe_wrapper()
+  if meson.is_cross_build()
     warning('cannot auto-detect -mtls-dialect when cross-compiling, using compiler default')
   else
     # -fpic to force dynamic tls, otherwise TLS relaxation defeats check