[24/81] We want to pass LIB through configuration files now
diff mbox

Message ID b20fb4ffb552be42bceeda83358b94b63a5fbc8c.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    2 +-
 Makefile.target |    1 -
 configure       |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/Makefile b/Makefile
index 1108b93..5149476 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@  VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS += -U_FORTIFY_SOURCE
-LIBS=-lz
+LIBS+=-lz

 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
diff --git a/Makefile.target b/Makefile.target
index 49ba08d..787df81 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -5,7 +5,6 @@  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
 #CFLAGS+=-Werror
-LIBS=

 ifdef CONFIG_USER_ONLY
 # user emulator name
diff --git a/configure b/configure
index c78eda1..bcdb1be 100755
--- a/configure
+++ b/configure
@@ -1748,6 +1748,7 @@  echo "CFLAGS=$CFLAGS" >> $config_host_mak
 echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
 echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
 echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
+echo "LIBS=$LIBS" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak