[Qemu-devel] [PATCH 28/37] fold NEEDS_LIBSUNMATH on generic variables

[quintela]

From: Juan Quintela <address@hidden>


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 c80abf3..b79ae93 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -54,13 +54,6 @@ endif
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
-ifdef CONFIG_SOLARIS
-ifdef NEEDS_LIBSUNMATH
-LIBS+=-lsunmath
-LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
-CFLAGS+=-I/opt/SUNWspro/prod/include/cc
-endif
-endif

 kvm.o: CFLAGS+=$(KVM_CFLAGS)
 kvm-all.o: CFLAGS+=$(KVM_CFLAGS)
diff --git a/configure b/configure
index bc208b2..c627ebb 100755
--- a/configure
+++ b/configure
@@ -1579,6 +1579,9 @@ if test "$solaris" = "yes" ; then
   if test "$needs_libsunmath" = "yes" ; then
     echo "NEEDS_LIBSUNMATH=yes" >> $config_host_mak
     echo "#define NEEDS_LIBSUNMATH 1" >> $config_host_h
+    LIBS="$LIBS -lsunmath"
+    LDFLAGS="$LDFLAGS -L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib"
+    CFLAGS="$CFLAGS -I/opt/SUNWspro/prod/include/cc"
   fi
 fi
 if test -n "$sparc_cpu"; then
-- 
1.6.2.5