[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths t
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure |
Date: |
Sun, 14 Nov 2010 12:48:54 +0100 |
Non-existent -I paths are dropped silently by the compiler, but still
it is not polite to pass bogus options. Configure-time tests do not
need any include files from the source path, so only include -I flags
at make time (when they're properly expanded).
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 19 +++++++++++--------
rules.mak | 6 +++---
tests/Makefile | 3 ++-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index b11bb44..812c41c 100755
--- a/configure
+++ b/configure
@@ -215,7 +215,7 @@ QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings
-Wmissing-prototypes $
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
$QEMU_CFLAGS"
QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
-QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
+QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
LDFLAGS="-g $LDFLAGS"
check_define() {
@@ -2425,7 +2425,7 @@ if test $profiler = "yes" ; then
fi
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
- QEMU_CFLAGS="-I\$(SRC_PATH)/slirp $QEMU_CFLAGS"
+ QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
@@ -2646,6 +2646,7 @@ echo "LD=$ld" >> $config_host_mak
echo "WINDRES=$windres" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
+echo "QEMU_INCLUDES=$QEMU_INCLUDES" >> $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
@@ -2954,19 +2955,20 @@ fi
# generate QEMU_CFLAGS/LDFLAGS for targets
cflags=""
+includes=""
ldflags=""
if test "$ARCH" = "sparc64" ; then
- cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"
+ includes="-I\$(SRC_PATH)/tcg/sparc $includes"
elif test "$ARCH" = "s390x" ; then
- cflags="-I\$(SRC_PATH)/tcg/s390 $cflags"
+ includes="-I\$(SRC_PATH)/tcg/s390 $includes"
elif test "$ARCH" = "x86_64" ; then
- cflags="-I\$(SRC_PATH)/tcg/i386 $cflags"
+ includes="-I\$(SRC_PATH)/tcg/i386 $includes"
else
- cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"
+ includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes"
fi
-cflags="-I\$(SRC_PATH)/tcg $cflags"
-cflags="-I\$(SRC_PATH)/fpu $cflags"
+includes="-I\$(SRC_PATH)/tcg $includes"
+includes="-I\$(SRC_PATH)/fpu $includes"
if test "$target_user_only" = "yes" ; then
libdis_config_mak=libdis-user/config.mak
@@ -3091,6 +3093,7 @@ fi
echo "LDFLAGS+=$ldflags" >> $config_target_mak
echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
+echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
done # for target in $targets
diff --git a/rules.mak b/rules.mak
index 6dac777..738eec3 100644
--- a/rules.mak
+++ b/rules.mak
@@ -15,13 +15,13 @@ MAKEFLAGS += -rR
QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
%.o: %.c
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c
-o $@ $<," CC $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@")
%.o: %.S
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c
-o $@ $<," AS $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@")
%.o: %.m
- $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c
-o $@ $<," OBJC $(TARGET_DIR)$@")
+ $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_INCLUDES)
$(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@")
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
$(1) $(LIBS)," LINK $(TARGET_DIR)$@")
diff --git a/tests/Makefile b/tests/Makefile
index e43ec70..9ded4b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -7,7 +7,8 @@ QEMU=../i386-linux-user/qemu-i386
QEMU_X86_64=../x86_64-linux-user/qemu-x86_64
CC_X86_64=$(CC_I386) -m64
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I..
+QEMU_INCLUDES += -I..
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing
#CFLAGS+=-msse2
LDFLAGS=
--
1.7.2.3
- [Qemu-devel] [PATCH 00/14] preparation for autoconfy configure script, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 01/14] default compilation tools to environment variables, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 02/14] default make and install to environment variables, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 03/14] move feature variables to the top, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 04/14] fix sparse support (?), Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 05/14] test cc with the complete set of chosen flags, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 06/14] do not pass bogus $(SRC_PATH) include paths to cc during configure,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 07/14] provide portable HOST_LONG_BITS test, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 08/14] fix spelling of $pkg_config, move default together with other cross tools, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 09/14] do not default to non-prefixed pkg-config when cross compiling, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 10/14] reorganize sdl-config tests, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 11/14] assume existence of "ln -sf", Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 12/14] simplify source_path handling, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 13/14] move --srcdir detection earlier, Paolo Bonzini, 2010/11/14
- [Qemu-devel] [PATCH 14/14] remove HOST_CC mention from roms/{sea, vga}bios/config.mak, Paolo Bonzini, 2010/11/14