[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/81] move check_linker_flags sooner than starting
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 05/81] move check_linker_flags sooner than starting of printing variables |
Date: |
Mon, 3 Aug 2009 14:45:56 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 64 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/configure b/configure
index ebec8d6..2594bb2 100755
--- a/configure
+++ b/configure
@@ -1394,6 +1394,37 @@ if test "$rt" = "yes" ; then
CLOCKLIBS="-lrt"
fi
+# Determine what linker flags to use to force archive inclusion
+check_linker_flags()
+{
+ w2=
+ if test "$2" ; then
+ w2=-Wl,$2
+ fi
+ $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null
2>/dev/null
+}
+
+cat > $TMPC << EOF
+int main(void) { }
+EOF
+if check_linker_flags --whole-archive --no-whole-archive ; then
+ # GNU ld
+ arlibs_begin="-Wl,--whole-archive"
+ arlibs_end="-Wl,--no-whole-archive"
+elif check_linker_flags -z,allextract -z,defaultextract ; then
+ # Solaris ld
+ arlibs_begin"=-Wl,-z,allextract"
+ arlibs_end="-Wl,-z,defaultextract"
+elif check_linker_flags -all_load ; then
+ # Mac OS X
+ arlibs_begin="-all_load"
+ arlibs_end=""
+else
+ echo "Error: your linker does not support --whole-archive or -z."
+ echo "Please report to address@hidden"
+ exit 1
+fi
+
if test "$mingw32" = "yes" ; then
if test -z "$prefix" ; then
prefix="c:\\\\Program Files\\\\Qemu"
@@ -1702,37 +1733,6 @@ bsd)
;;
esac
-# Determine what linker flags to use to force archive inclusion
-check_linker_flags()
-{
- w2=
- if test "$2" ; then
- w2=-Wl,$2
- fi
- $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null
2>/dev/null
-}
-
-cat > $TMPC << EOF
-int main(void) { }
-EOF
-if check_linker_flags --whole-archive --no-whole-archive ; then
- # GNU ld
- echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_host_mak
- echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_host_mak
-elif check_linker_flags -z,allextract -z,defaultextract ; then
- # Solaris ld
- echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_host_mak
- echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_host_mak
-elif check_linker_flags -all_load ; then
- # Mac OS X
- echo "ARLIBS_BEGIN=-all_load" >> $config_host_mak
- echo "ARLIBS_END=" >> $config_host_mak
-else
- echo "Error: your linker does not support --whole-archive or -z."
- echo "Please report to address@hidden"
- exit 1
-fi
-
tools=
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools"
@@ -1772,6 +1772,8 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak
echo "LD=$ld" >> $config_host_mak
echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >>
$config_host_mak
+echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
+echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
--
1.6.2.5
- [Qemu-devel] [PATCH v2 00/81] More Makefile/configure simplification, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 01/81] strip binary is not used anywhere, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 03/81] Use CFLAGS from enviroment, ARCH_CFLAGS hasn't been defined yet, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 02/81] oss variable don't exist anymore, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 04/81] move cpu command line setting to the beggining, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 05/81] move check_linker_flags sooner than starting of printing variables,
Juan Quintela <=
- [Qemu-devel] [PATCH 07/81] move checks for bswap32/bswap_32 sooner than starting of printing variables, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 06/81] remove not needed rt variable, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 09/81] We want to add options at the beggining, not at the end of variables, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 08/81] move general CFLAGS/LDFLAGS definitions after last $cc run, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 11/81] move EXTRA_CFLAGS/LDFLAGS to the very beginning, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 14/81] Add CURL_CFLAGS, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 10/81] Remove OS_{CFLAGS, LDFLAGS} and ARCH_{LDFLAGS, CFLAGS}, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 12/81] create compile_object/compile_prog functions, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 13/81] remove unused temporal files, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 15/81] __sparc_*__ is defined through -D__sparc_*__, Juan Quintela, 2009/08/03