| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | Configure checks for compiler to be gcc and then it enables asm_offsets |
| 2 | generation. see |
| 3 | |
| 4 | https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d |
| 5 | |
| 6 | However, we missed the check when enabling this on cross compilation |
| 7 | when architecture for both host and target is x86 |
| 8 | |
| 9 | Fixes errors like |
| 10 | ./gen_matypes > matypes.h |
| 11 | /bin/bash: ./gen_matypes: No such file or directory |
| 12 | |
| 13 | -Khem |
| 14 | |
| 15 | Upstream-Status: Submitted |
| 16 | |
| 17 | Index: mesa-12.0.1/configure.ac |
| 18 | =================================================================== |
| 19 | --- mesa-12.0.1.orig/configure.ac |
| 20 | +++ mesa-12.0.1/configure.ac |
| 21 | @@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU |
| 22 | if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then |
| 23 | case "$host_cpu" in |
| 24 | i?86 | x86_64 | amd64) |
| 25 | - if test "x$host_cpu" != "x$target_cpu"; then |
| 26 | + if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then |
| 27 | enable_asm=no |
| 28 | AC_MSG_RESULT([no, cross compiling]) |
| 29 | fi |