[Qemu-devel] [PATCH 80/81] Move libsunpath to use the same style than everything else

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |    7 -------
 configure       |    3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 79fc5a7..485a8c8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -24,13 +24,6 @@ translate.o: QEMU_CFLAGS += $(call cc-option, 
$(QEMU_CFLAGS), -fno-unit-at-a-tim
 endif

 LIBS+=-lm
-ifdef CONFIG_SOLARIS
-ifdef CONFIG_NEEDS_LIBSUNMATH
-LIBS+=-lsunmath
-LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
-QEMU_CFLAGS+=-I/opt/SUNWspro/prod/include/cc
-endif
-endif

 kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS)

diff --git a/configure b/configure
index d325c25..80e2838 100755
--- a/configure
+++ b/configure
@@ -309,6 +309,9 @@ SunOS)
     if test "$solarisrev" -le 9 ; then
       if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
         needs_libsunmath="yes"
+        QEMU_CFLAGS="-I/opt/SUNWspro/prod/include/cc $QEMU_CFLAGS"
+        LDFLAGS="-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib $LDFLAGS"
+        LIBS="-lsunmath $LIBS"
       else
         echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without"
         echo "libsunmath from the Sun Studio compilers tools, due to a lack of"
-- 
1.6.2.5