Fix --extra-cflags, --extra-ldflags

PATCH New Steve Magoun 1 participant 1 message Dec 21, 2005 Kbuild

Share & tools

Steve Magoun

author

2005-12-21 15:52 UTC #0 lore raw

PATCH 1/1 Fix --extra-cflags, --extra-ldflags

This patch fixes the --extra-cflags and --extra-ldflags arguments to configure; without the patch extra flags passed through those arguments were ignored.

Steve

Index: Makefile
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile,v
retrieving revision 1.91

Makefile 21 Dec 2005 15:32:53 -0000 renamed from Makefile 6 Dec 2005 21:42:03 -0000 1.91 +2 -2

diff -u -r1.91 Makefile
@@ -1,10 +1,10 @@
 -include config-host.mak
 
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
-LDFLAGS=-g
+LDFLAGS+=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 TOOLS=qemu-img$(EXESUF)

Index: Makefile.target
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile.target,v
retrieving revision 1.90

Makefile.target 21 Dec 2005 15:32:53 -0000 renamed from Makefile.target 6 Dec 2005 21:42:17 -0000 1.90 +2 -3

diff -u -r1.90 Makefile.target
@@ -17,9 +17,9 @@
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user 
-I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
+CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
 #CFLAGS+=-Werror
-LDFLAGS=-g
+LDFLAGS+=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)

DYNGEN=../dyngen$(EXESUF)