[Qemu-devel] [PATCH] Fix some configure/Makefile weirdness

[Qemu-devel] [PATCH] Fix some configure/Makefile weirdness

[Thiemo Seufer]

Hello All,

the appended patch allows for propagating CFLAGS and LDFLAGS to the host
Makefile. This reactivates the (undocumented) --extra-cflags= and
--extra-ldflags= options of configure which are currently NOPs.
It also removes the CFLAGS=-O2 default from configure since it is
already hardcoded in Makefile and Makefile.target.

Comments?


Thiemo


Index: Makefile
===================================================================
RCS file: /sources/qemu/qemu/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile	5 Aug 2006 21:29:27 -0000	1.106
+++ Makefile	21 Dec 2006 18:48:34 -0000
@@ -5,14 +5,14 @@ include config-host.mak
 .PHONY: all clean distclean dvi info install install-doc tar tarbin \
 	speed test test2 html dvi info
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
+CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
 ifeq ($(ARCH),sparc)
 CFLAGS+=-mcpu=ultrasparc
 endif
-LDFLAGS=-g
+LDFLAGS+=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 TOOLS=qemu-img$(EXESUF)
Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.113
diff -u -p -r1.113 configure
--- configure	19 Dec 2006 03:31:34 -0000	1.113
+++ configure	21 Dec 2006 18:48:34 -0000
@@ -243,11 +243,6 @@ for opt do
   esac
 done
 
-# Checking for CFLAGS
-if test -z "$CFLAGS"; then
-    CFLAGS="-O2"
-fi
-
 if test x"$show_help" = x"yes" ; then
 cat << EOF