[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/37] Add -static in configure if needed
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 15/37] Add -static in configure if needed |
Date: |
Fri, 17 Jul 2009 21:21:08 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 3 ---
Makefile.target | 11 -----------
configure | 1 +
3 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 4cf790d..a50158b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,6 @@ CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CPPFLAGS += -U_FORTIFY_SOURCE
-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 1060c30..78f6f19 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -173,10 +173,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
@@ -317,10 +313,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
@@ -615,9 +607,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 06e0af1..d3fb000 100755
--- a/configure
+++ b/configure
@@ -1591,6 +1591,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 09/37] make oss use OSS_LIBS, (continued)
- [Qemu-devel] [PATCH 09/37] make oss use OSS_LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 07/37] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 08/37] make fmod also use FMOD_{LIBS,CFLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 10/37] move printing of config-host.mak variables to end of generation, quintela, 2009/07/17
- [Qemu-devel] [PATCH 11/37] more specific config.mak can overwrote more general config.mak, quintela, 2009/07/17
- [Qemu-devel] [PATCH 14/37] CONFIG_SOLARIS always want -lsockt -lnsl -lresolv, quintela, 2009/07/17
- [Qemu-devel] [PATCH 13/37] fold PTHREADLIBS and CLOCKLIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 12/37] generate CPPFLAGS and LIBS on ./configure, quintela, 2009/07/17
- [Qemu-devel] [PATCH 16/37] generate CONFIG_WIN32 libraries in configure, quintela, 2009/07/17
- [Qemu-devel] [PATCH 15/37] Add -static in configure if needed,
quintela <=
- [Qemu-devel] [PATCH 18/37] fold CURL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 17/37] fold VDE_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 22/37] fold BLUEZ_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 20/37] fold CURSES_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 19/37] fold BRLAPI_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 23/37] fold VNC_TLS_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 24/37] fold VNC_SASL_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 25/37] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile, quintela, 2009/07/17
- [Qemu-devel] [PATCH 21/37] fold XEN_LIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 27/37] fold FDT_LIBS on generic LIBS, quintela, 2009/07/17