[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/37] move printing of config-host.mak variables to
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 10/37] move printing of config-host.mak variables to end of generation |
Date: |
Fri, 17 Jul 2009 21:21:03 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index c5e5436..f05ace5 100755
--- a/configure
+++ b/configure
@@ -1497,27 +1497,8 @@ printf " '%s'" "$0" "$@" >> $config_host_mak
echo >> $config_host_mak
echo "/* Automatically generated by configure - do not modify */" >
$config_host_h
-echo "prefix=$prefix" >> $config_host_mak
-echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
-echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
-echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
-echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h
-echo "MAKE=$make" >> $config_host_mak
-echo "INSTALL=$install" >> $config_host_mak
-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
-echo "CC=$cc" >> $config_host_mak
-echo "HOST_CC=$host_cc" >> $config_host_mak
-echo "AR=$ar" >> $config_host_mak
-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 "EXESUF=$EXESUF" >> $config_host_mak
-echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
-echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
+
case "$cpu" in
i386|x86_64|alpha|cris|hppa|ia64|m68k|microbaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
ARCH=$cpu
@@ -1540,11 +1521,6 @@ fi
if test "$debug" = "yes" ; then
echo "#define DEBUG_EXEC 1" >> $config_host_h
fi
-if test "$sparse" = "yes" ; then
- echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
- echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
- echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer
-Wno-non-pointer-null" >> $config_host_mak
-fi
if test "$strip_opt" = "yes" ; then
echo "STRIP_OPT=-s" >> $config_host_mak
fi
@@ -1838,6 +1814,32 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
fi
echo "ROMS=$roms" >> $config_host_mak
+echo "prefix=$prefix" >> $config_host_mak
+echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
+echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
+echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
+echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
+echo "MAKE=$make" >> $config_host_mak
+echo "INSTALL=$install" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "CC=$cc" >> $config_host_mak
+echo "HOST_CC=$host_cc" >> $config_host_mak
+if test "$sparse" = "yes" ; then
+ echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
+ echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
+ echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer
-Wno-non-pointer-null" >> $config_host_mak
+fi
+echo "AR=$ar" >> $config_host_mak
+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 "EXESUF=$EXESUF" >> $config_host_mak
+echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
+echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
+
if test -f ${config_host_h}~ ; then
if cmp -s $config_host_h ${config_host_h}~ ; then
mv ${config_host_h}~ $config_host_h
--
1.6.2.5
- [Qemu-devel] [PATCH 00/37] Generate a proper LIBS variable, quintela, 2009/07/17
- [Qemu-devel] [PATCH 01/37] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 02/37] Remove SP_CFLAGS and SP_LDFLAGS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 03/37] target_arch2 is redefined unconditionally later, quintela, 2009/07/17
- [Qemu-devel] [PATCH 04/37] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 05/37] use same algorithm for testing and, quintela, 2009/07/17
- [Qemu-devel] [PATCH 06/37] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, quintela, 2009/07/17
- [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 <=
- [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, 2009/07/17
- [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