Makefile etc.: Use -no-integrated-cpp

I have found that GCC 4.7.2 (Debian i386 4.7.2-5) sometimes misreports
errors relating to broken #includes when the integrated cpp is in use.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 3e4e12f017d993c768aeabf07e45b4b37ef07abc..a2e1f1dee19f6db7ab359feac70c097252eed87c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ include minios.mk
 
 CFLAGS += -Irump/include -nostdinc
 CFLAGS += -DVIRTIF_BASE=xenif -I$(MINI-OS_ROOT)
+CFLAGS += -no-integrated-cpp
 
 ifeq ($(CONFIG_PCI),y)
 LIBS_PCI = -lrumpdev_pci -lrumpdev_pci_if_wm -lrumpdev_miiphy

diff --git a/app-tools/rumpxen-app-cc.in b/app-tools/rumpxen-app-cc.in
index 6a80a4a006c6ee3a23478deea398ef677f740cba..0e8b8ff0cb769d31f1d43c11e171d5f1edc4eba2 100755 (executable)
--- a/app-tools/rumpxen-app-cc.in
+++ b/app-tools/rumpxen-app-cc.in
@@ -3,4 +3,5 @@ set -e
 case " $* " in
 *" -v "*)   set -x ;;
 esac
-exec gcc -D__RUMPUSER_XEN__ -D__NetBSD__ -specs=!APPTOOLS!/specs "$@"
+exec gcc -D__RUMPUSER_XEN__ -D__NetBSD__ -no-integrated-cpp \
+ -specs=!APPTOOLS!/specs "$@"