[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/47] move printing of config-host.mak variables to
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/47] move printing of config-host.mak variables to end of generation |
Date: |
Mon, 27 Jul 2009 16:12:49 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index 42dee87..25fd453 100755
--- a/configure
+++ b/configure
@@ -1500,27 +1500,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|microblaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
ARCH=$cpu
@@ -1543,11 +1524,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
@@ -1839,6 +1815,32 @@ if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then
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 v3 00/47] More configure/Makefile cleanups, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 01/47] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 02/47] Remove SP_CFLAGS and SP_LDFLAGS, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 04/47] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 03/47] target_arch2 is redefined unconditionally later, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 07/47] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 05/47] use same algorithm for testing and, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 06/47] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 08/47] make fmod also use FMOD_{LIBS,CFLAGS}, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 10/47] move printing of config-host.mak variables to end of generation,
Juan Quintela <=
- [Qemu-devel] [PATCH 11/47] more specific config.mak can overwrote more general config.mak, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 09/47] make oss use OSS_LIBS, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 13/47] Rename HAVE_FDT to CONFIG_FDT and define it also in Makefile, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 12/47] Add -static in configure if needed, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 15/47] fix indententation, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 14/47] Refactor code to remove one #ifdef CONFIG_FDT, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 18/47] define MAP_ANONYMOUS if it is not defined in qemu-common.h, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 23/47] rename HAVE_GPROF to TARGET_GPROF, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 20/47] rename HAVE_IOVEC to CONFIG_IOVEC, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 21/47] rename HAVE_FNMATCH_H to CONFIG_FNMATCH, Juan Quintela, 2009/07/27