aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:47:11 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:48 -0500
commitf14bfdf95283fc6401a4f701140838b91511f499 (patch)
treed7b6e7e2744b8d83b9e55b6903804ece68c0aed5
parentf622d8a33dfbd83468d71e48624925c950b4010e (diff)
Move libsunpath to use the same style than everything else
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile.target7
-rwxr-xr-xconfigure3
2 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.target b/Makefile.target
index 08d9e961e9..b7406f841c 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 6349d2e0f1..834d88ed82 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"