From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTwfK-0007du-Pe for qemu-devel@nongnu.org; Thu, 23 Jul 2009 07:40:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTwfF-0007bs-PH for qemu-devel@nongnu.org; Thu, 23 Jul 2009 07:40:49 -0400 Received: from [199.232.76.173] (port=37268 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTwfD-0007bf-OP for qemu-devel@nongnu.org; Thu, 23 Jul 2009 07:40:43 -0400 Received: from mx20.gnu.org ([199.232.41.8]:38295) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MTwfD-0000Ug-Eb for qemu-devel@nongnu.org; Thu, 23 Jul 2009 07:40:43 -0400 Received: from mail.codesourcery.com ([65.74.133.4]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTwfC-00079T-B7 for qemu-devel@nongnu.org; Thu, 23 Jul 2009 07:40:42 -0400 From: Nathan Froyd Date: Thu, 23 Jul 2009 04:40:41 -0700 Message-Id: <1248349241-26029-1-git-send-email-froydnj@codesourcery.com> Subject: [Qemu-devel] [PATCH] configure: fix breakage of --extra-{cflags, ldflags} List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Commit e3fc14c3a1a77a1cda669a3e16f1f6b82577e4ec broke the use of --extra-{cflags,ldflags} in the case where those flags were necessary for bits of configure to succeed. For instance, if you did: configure [...] --extra-cflags=-I/path/to/zlib/headers \ --extra-ldflags=-L/path/to/zlib/libraries prior to the above commit, the paths would go into CFLAGS and LDFLAGS for use by the rest of the configure tests. After the above commit, that's no longer true, because the EXTRA_{CFLAGS,LDFLAGS} variables are only used for creating makefiles. Fixed by making sure that EXTRA_{CFLAGS,LDFLAGS} find their way into {CFLAGS,LDFLAGS}, respectively. Signed-off-by: Nathan Froyd --- configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0db885b..dd2b1d9 100755 --- a/configure +++ b/configure @@ -520,8 +520,8 @@ CFLAGS="$CFLAGS -g -fno-strict-aliasing" if test "$debug" = "no" ; then CFLAGS="$CFLAGS -O2" fi -CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" -LDFLAGS="$LDFLAGS -g" +CFLAGS="$CFLAGS $EXTRA_CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" +LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS -g" # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds -- 1.6.2.4