[Mesa-dev] [PATCH] build: Enable cross compiling assembly by building gen_matypes for the host

[Matt Turner]

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=49360
---
 configure.ac                |   10 +---------
 src/mesa/x86-64/Makefile.am |    9 +++++++++
 src/mesa/x86/Makefile.am    |    9 +++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index e769eda..f251689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,15 +434,7 @@ asm_arch=""
 MESA_ASM_FILES=""
 AC_MSG_CHECKING([whether to enable assembly])
 test "x$enable_asm" = xno && AC_MSG_RESULT([no])
-# disable if cross compiling on x86/x86_64 since we must run gen_matypes
-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
-    case "$host_cpu" in
-    i?86 | x86_64)
-        enable_asm=no
-        AC_MSG_RESULT([no, cross compiling])
-        ;;
-    esac
-fi
+
 # check for supported arches
 if test "x$enable_asm" = xyes; then
     case "$host_cpu" in
diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x86-64/Makefile.am
index baeb4b6..fe745d7 100644
--- a/src/mesa/x86-64/Makefile.am
+++ b/src/mesa/x86-64/Makefile.am
@@ -19,6 +19,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+CC = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS_FOR_BUILD@
+CPP = @CPP_FOR_BUILD@
+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+CXX = @CXX_FOR_BUILD@
+CXXFLAGS = @CXXFLAGS_FOR_BUILD@
+LD = @LD_FOR_BUILD@
+LDFLAGS = @LDFLAGS_FOR_BUILD@
+
 if HAVE_X86_64_ASM
 
 AM_CPPFLAGS = \
diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
index 5976bb4..a1fba9a 100644
--- a/src/mesa/x86/Makefile.am
+++ b/src/mesa/x86/Makefile.am
@@ -19,6 +19,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+CC = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS_FOR_BUILD@
+CPP = @CPP_FOR_BUILD@
+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+CXX = @CXX_FOR_BUILD@
+CXXFLAGS = @CXXFLAGS_FOR_BUILD@
+LD = @LD_FOR_BUILD@
+LDFLAGS = @LDFLAGS_FOR_BUILD@
+
 if HAVE_X86_ASM
 
 AM_CPPFLAGS = \
-- 
1.7.8.6