mirror of https://gitee.com/openkylin/qemu.git
move printing of config-host.mak variables to end of generation
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
6881964cfa
commit
804edf29ae
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue