gwj / at91sam9263 · Commits

Commit 804edf29aee58d458c5552383815b8a4f7afeba6

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 6881964c

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>
Inline Side-by-side
Showing 1 changed file with 27 additions and 25 deletions
configure
  View file @804edf2
@@ -1500,27 +1500,8 @@ printf &quot; &#39;%s&#39;&quot; &quot;$0&quot; &quot;$@&quot; &gt;&gt; $config_host_mak @@ -1500,27 +1500,8 @@ printf &quot; &#39;%s&#39;&quot; &quot;$0&quot; &quot;$@&quot; &gt;&gt; $config_host_mak
1500 echo >> $config_host_mak 1500 echo >> $config_host_mak
1501 echo "/* Automatically generated by configure - do not modify */" > $config_host_h 1501 echo "/* Automatically generated by configure - do not modify */" > $config_host_h
1502 1502
1503 -echo "prefix=$prefix" >> $config_host_mak  
1504 -echo "bindir=\${prefix}$binsuffix" >> $config_host_mak  
1505 -echo "mandir=\${prefix}$mansuffix" >> $config_host_mak  
1506 -echo "datadir=\${prefix}$datasuffix" >> $config_host_mak  
1507 -echo "docdir=\${prefix}$docsuffix" >> $config_host_mak  
1508 echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h 1503 echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h
1509 -echo "MAKE=$make" >> $config_host_mak  
1510 -echo "INSTALL=$install" >> $config_host_mak  
1511 -echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak  
1512 -echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak  
1513 -echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak  
1514 -echo "CC=$cc" >> $config_host_mak  
1515 -echo "HOST_CC=$host_cc" >> $config_host_mak  
1516 -echo "AR=$ar" >> $config_host_mak  
1517 -echo "OBJCOPY=$objcopy" >> $config_host_mak  
1518 -echo "LD=$ld" >> $config_host_mak  
1519 -echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak  
1520 -echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak  
1521 -echo "EXESUF=$EXESUF" >> $config_host_mak  
1522 -echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak  
1523 -echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak 1504 +
1524 case "$cpu" in 1505 case "$cpu" in
1525 i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64) 1506 i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
1526 ARCH=$cpu 1507 ARCH=$cpu
@@ -1543,11 +1524,6 @@ fi @@ -1543,11 +1524,6 @@ fi
1543 if test "$debug" = "yes" ; then 1524 if test "$debug" = "yes" ; then
1544 echo "#define DEBUG_EXEC 1" >> $config_host_h 1525 echo "#define DEBUG_EXEC 1" >> $config_host_h
1545 fi 1526 fi
1546 -if test "$sparse" = "yes" ; then  
1547 - echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak  
1548 - echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak  
1549 - echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak  
1550 -fi  
1551 if test "$strip_opt" = "yes" ; then 1527 if test "$strip_opt" = "yes" ; then
1552 echo "STRIP_OPT=-s" >> $config_host_mak 1528 echo "STRIP_OPT=-s" >> $config_host_mak
1553 fi 1529 fi
@@ -1839,6 +1815,32 @@ if test &quot;$cpu&quot; = &quot;i386&quot; -o &quot;$cpu&quot; = &quot;x86_64&quot; ; then @@ -1839,6 +1815,32 @@ if test &quot;$cpu&quot; = &quot;i386&quot; -o &quot;$cpu&quot; = &quot;x86_64&quot; ; then
1839 fi 1815 fi
1840 echo "ROMS=$roms" >> $config_host_mak 1816 echo "ROMS=$roms" >> $config_host_mak
1841 1817
  1818 +echo "prefix=$prefix" >> $config_host_mak
  1819 +echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
  1820 +echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
  1821 +echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
  1822 +echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
  1823 +echo "MAKE=$make" >> $config_host_mak
  1824 +echo "INSTALL=$install" >> $config_host_mak
  1825 +echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
  1826 +echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
  1827 +echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
  1828 +echo "CC=$cc" >> $config_host_mak
  1829 +echo "HOST_CC=$host_cc" >> $config_host_mak
  1830 +if test "$sparse" = "yes" ; then
  1831 + echo "CC := REAL_CC=\"\$(CC)\" cgcc" >> $config_host_mak
  1832 + echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc" >> $config_host_mak
  1833 + echo "CFLAGS += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
  1834 +fi
  1835 +echo "AR=$ar" >> $config_host_mak
  1836 +echo "OBJCOPY=$objcopy" >> $config_host_mak
  1837 +echo "LD=$ld" >> $config_host_mak
  1838 +echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
  1839 +echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
  1840 +echo "EXESUF=$EXESUF" >> $config_host_mak
  1841 +echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
  1842 +echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
  1843 +
1842 if test -f ${config_host_h}~ ; then 1844 if test -f ${config_host_h}~ ; then
1843 if cmp -s $config_host_h ${config_host_h}~ ; then 1845 if cmp -s $config_host_h ${config_host_h}~ ; then
1844 mv ${config_host_h}~ $config_host_h 1846 mv ${config_host_h}~ $config_host_h