Add -static in configure if needed
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
f36fc7a135
commit
67c0f08d16
4
Makefile
4
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 += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||||
CPPFLAGS += -U_FORTIFY_SOURCE
|
CPPFLAGS += -U_FORTIFY_SOURCE
|
||||||
LIBS=
|
LIBS=
|
||||||
ifdef CONFIG_STATIC
|
|
||||||
LDFLAGS += -static
|
|
||||||
endif
|
|
||||||
ifdef BUILD_DOCS
|
ifdef BUILD_DOCS
|
||||||
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
|
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
|
||||||
else
|
else
|
||||||
|
@ -175,10 +175,6 @@ ifdef CONFIG_LINUX_USER
|
|||||||
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
|
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)
|
CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
|
||||||
|
|
||||||
ifdef CONFIG_STATIC
|
|
||||||
LDFLAGS+=-static
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(ARCH),i386)
|
ifeq ($(ARCH),i386)
|
||||||
ifdef TARGET_GPROF
|
ifdef TARGET_GPROF
|
||||||
USE_I386_LD=y
|
USE_I386_LD=y
|
||||||
@ -322,10 +318,6 @@ ifdef CONFIG_BSD_USER
|
|||||||
VPATH+=:$(SRC_PATH)/bsd-user
|
VPATH+=:$(SRC_PATH)/bsd-user
|
||||||
CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
|
CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)
|
||||||
|
|
||||||
ifdef CONFIG_STATIC
|
|
||||||
LDFLAGS+=-static
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(ARCH),i386)
|
ifeq ($(ARCH),i386)
|
||||||
ifdef TARGET_GPROF
|
ifdef TARGET_GPROF
|
||||||
USE_I386_LD=y
|
USE_I386_LD=y
|
||||||
@ -620,9 +612,6 @@ CPPFLAGS+=-I$(SRC_PATH)/slirp
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
# specific flags are needed for non soft mmu emulator
|
# specific flags are needed for non soft mmu emulator
|
||||||
ifdef CONFIG_STATIC
|
|
||||||
LDFLAGS+=-static
|
|
||||||
endif
|
|
||||||
ifndef CONFIG_DARWIN
|
ifndef CONFIG_DARWIN
|
||||||
ifndef CONFIG_WIN32
|
ifndef CONFIG_WIN32
|
||||||
ifndef CONFIG_SOLARIS
|
ifndef CONFIG_SOLARIS
|
||||||
|
1
configure
vendored
1
configure
vendored
@ -1588,6 +1588,7 @@ fi
|
|||||||
if test "$static" = "yes" ; then
|
if test "$static" = "yes" ; then
|
||||||
echo "CONFIG_STATIC=y" >> $config_host_mak
|
echo "CONFIG_STATIC=y" >> $config_host_mak
|
||||||
echo "#define CONFIG_STATIC 1" >> $config_host_h
|
echo "#define CONFIG_STATIC 1" >> $config_host_h
|
||||||
|
LDFLAGS="$LDFLAGS -static"
|
||||||
fi
|
fi
|
||||||
if test $profiler = "yes" ; then
|
if test $profiler = "yes" ; then
|
||||||
echo "#define CONFIG_PROFILER 1" >> $config_host_h
|
echo "#define CONFIG_PROFILER 1" >> $config_host_h
|
||||||
|
Loading…
Reference in New Issue
Block a user