diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-07 10:48:38 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-11 10:08:30 -0700 |
| commit | dd173da7a284f7b3fd6089b6f60c44604be08735 (patch) | |
| tree | 647a469d7e25e995d831f08647860ebf78de2b73 | |
| parent | d6533c02d00b7daa71eeed49577f266da1f072cb (diff) | |
| download | mesa-dd173da7a284f7b3fd6089b6f60c44604be08735.tar.gz | |
meson: work around gentoo applying -m32 to host compiler in cross builds
Gentoo's ebuild system always adds -m32 to the compiler for doing x86_64
-> x86 cross builds, while meson expects it not to do that. This
results in an x86 -> x86 cross build, and assembly gets disabled.
Fixes: 2d62fc06465281d3d45b8a7c7fd2b17ef718448c
("meson: disable x86 asm in fewer cases.")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit 8f2421d73be596c12019196189255f22fd3edb54)
Conflicts:
meson.build
I manually resolved the conflicts between this patch and 18.1 to avoid
pulling in another patch.
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0ecd14cc5c6..4abe131dd09 100644 --- a/meson.build +++ b/meson.build @@ -873,7 +873,7 @@ endif # TODO: it should be possible to use an exe_wrapper to run the binary during # the build. if meson.is_cross_build() - if not (build_machine.cpu_family() == 'x86_64' and host_machine.cpu_family() == 'x86' + if not (build_machine.cpu_family().startswith('x86') and host_machine.cpu_family() == 'x86' and build_machine.system() == host_machine.system()) message('Cross compiling to x86 from non-x86, disabling asm') with_asm = false |