[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/46] Add -static in configure if needed
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 12/46] Add -static in configure if needed |
Date: |
Fri, 24 Jul 2009 20:30:12 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 4 +---
Makefile.target | 11 -----------
configure | 1 +
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index c176aa2..47e5825 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,7 @@ 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=
-ifdef CONFIG_STATIC
-LDFLAGS += -static
-endif
+
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
else
diff --git a/Makefile.target b/Makefile.target
index b7a3f4d..b2237dd 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -175,10 +175,6 @@ ifdef CONFIG_LINUX_USER
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
-ifdef CONFIG_STATIC
-LDFLAGS+=-static
-endif
-
ifeq ($(ARCH),i386)
ifdef TARGET_GPROF
USE_I386_LD=y
@@ -322,10 +318,6 @@ ifdef CONFIG_BSD_USER
VPATH+=:$(SRC_PATH)/bsd-user
CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
-ifdef CONFIG_STATIC
-LDFLAGS+=-static
-endif
-
ifeq ($(ARCH),i386)
ifdef TARGET_GPROF
USE_I386_LD=y
@@ -620,9 +612,6 @@ CPPFLAGS+=-I$(SRC_PATH)/slirp
endif
# specific flags are needed for non soft mmu emulator
-ifdef CONFIG_STATIC
-LDFLAGS+=-static
-endif
ifndef CONFIG_DARWIN
ifndef CONFIG_WIN32
ifndef CONFIG_SOLARIS
diff --git a/configure b/configure
index 25fd453..df9ade2 100755
--- a/configure
+++ b/configure
@@ -1588,6 +1588,7 @@ fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
echo "#define CONFIG_STATIC 1" >> $config_host_h
+ LDFLAGS="$LDFLAGS -static"
fi
if test $profiler = "yes" ; then
echo "#define CONFIG_PROFILER 1" >> $config_host_h
--
1.6.2.5
- [Qemu-devel] [PATCH 20/46] rename HAVE_IOVEC to CONFIG_IOVEC, (continued)
- [Qemu-devel] [PATCH 20/46] rename HAVE_IOVEC to CONFIG_IOVEC, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 03/46] target_arch2 is redefined unconditionally later, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 16/46] O_LARGEFILE is already set in qemu-common.h, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 13/46] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 14/46] Refactor code to remove one #ifdef CONFIG_FDT, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 19/46] rename HAVE_PREADV to CONFIG_PREADV, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 18/46] define MAP_ANONYMOUS if it is not defined in qemu-common.h, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 17/46] rename HOST_BSD to CONFIG_BSD, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 23/46] rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_H, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 11/46] more specific config.mak can overwrote more general config.mak, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 12/46] Add -static in configure if needed,
Juan Quintela <=