From 1e8a594957d84a37e66183e9c0cb9d42b62bdb24 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 2 May 2006 01:37:25 +0000 Subject: [PATCH] Fix Solaris build with Sun compilers to work when exa is built before hw/xfree86/os-support/solaris (as it is by default now). --- ChangeLog | 7 +++++++ configure.ac | 3 ++- exa/Makefile.am | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cbe4c0457..bc32a22f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-01 Alan Coopersmith + + * configure.ac: + * exa/Makefile.am: + Fix Solaris build with Sun compilers to work when exa is built before + hw/xfree86/os-support/solaris (as it is by default now). + 2006-05-01 Alan Coopersmith * os/WaitFor.c: diff --git a/configure.ac b/configure.ac index d79ea592b..e43354cd7 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,7 +1142,8 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then esac AC_SUBST([SOLARIS_INOUT_ARCH]) if test x$solaris_asm_inline = xyes ; then - XORG_CFLAGS="${XORG_CFLAGS} "'$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-${SOLARIS_INOUT_ARCH}.il' + SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il' + XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)' fi ;; *) diff --git a/exa/Makefile.am b/exa/Makefile.am index c9cbf9b45..98db0271f 100644 --- a/exa/Makefile.am +++ b/exa/Makefile.am @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libexa.la +# Override these since EXA doesn't need them and the needed files aren't +# built (in hw/xfree86/os-support/solaris) until after EXA is built +SOLARIS_ASM_CFLAGS="" + if XORG sdk_HEADERS = exa.h endif