# HG changeset patch
# User gthomas
# Date 1066247936 0
# Node ID 68ee1bf08a38fe678fcddd4d218b3af1ef27af4c
# Parent  08edfb52f9cdcf198077938e3debc371ebfd8df1
Workaround problems with GCC 3.3.x - BUG 1000035

diff --git a/packages/ChangeLog b/packages/ChangeLog
--- a/packages/ChangeLog
+++ b/packages/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-15  Gary Thomas  <gary@mlbassoc.com>
+2003-09-23  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* pkgconf/rules.mak Only pass C flags to the C compiler.
+	Workaround for BUG #1000035.
+ 
 2003-10-04  Savin Zlobec <savin@elatec.si>
 
 	* ecos.db: New package - Synth wall clock device
diff --git a/packages/pkgconf/rules.mak b/packages/pkgconf/rules.mak
--- a/packages/pkgconf/rules.mak
+++ b/packages/pkgconf/rules.mak
@@ -59,6 +59,11 @@ ifneq ($(wildcard *.deps),)
 include $(wildcard *.deps)
 endif
 
+# Separate C++ flags out from C flags.
+ACTUAL_CFLAGS = $(CFLAGS)
+ACTUAL_CFLAGS := $(subst -fno-rtti,,$(ACTUAL_CFLAGS))
+ACTUAL_CFLAGS := $(subst -Woverloaded-virtual,,$(ACTUAL_CFLAGS))
+ACTUAL_CFLAGS := $(subst -fvtable-gc,,$(ACTUAL_CFLAGS))
 
 # pattern matching rules to generate a library object from source code
 # object filenames are prefixed to avoid name clashes
@@ -69,7 +74,7 @@ ifeq ($(HOST),CYGWIN)
 else
 	@mkdir -p $(dir $@)
 endif
-	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(CFLAGS) -Wp,-MD,$(@:.o.d=.tmp) -o $(dir $@)$(OBJECT_PREFIX)_$(notdir $(@:.o.d=.o)) $<
+	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(ACTUAL_CFLAGS) -Wp,-MD,$(@:.o.d=.tmp) -o $(dir $@)$(OBJECT_PREFIX)_$(notdir $(@:.o.d=.o)) $<
 	@sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.o.d=.tmp) > $@
 	@rm $(@:.o.d=.tmp)
 
@@ -99,7 +104,7 @@ ifeq ($(HOST),CYGWIN)
 else
 	@mkdir -p $(dir $@)
 endif	
-	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(CFLAGS) -Wp,-MD,$(@:.o.d=.tmp) -o $(dir $@)$(OBJECT_PREFIX)_$(notdir $(@:.o.d=.o)) $<
+	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(ACTUAL_CFLAGS) -Wp,-MD,$(@:.o.d=.tmp) -o $(dir $@)$(OBJECT_PREFIX)_$(notdir $(@:.o.d=.o)) $<
 	@sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.o.d=.tmp) > $@
 	@rm $(@:.o.d=.tmp)
 
@@ -112,7 +117,7 @@ ifeq ($(HOST),CYGWIN)
 else
 	@mkdir -p $(dir $@)
 endif
-	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(CFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $<
+	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(ACTUAL_CFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $<
 	@sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.d=.tmp) > $@
 	@rm $(@:.d=.tmp)
 
@@ -142,7 +147,7 @@ ifeq ($(HOST),CYGWIN)
 else
 	@mkdir -p $(dir $@)
 endif	
-	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(CFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $<
+	$(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(ACTUAL_CFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $<
 	@sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.d=.tmp) > $@
 	@rm $(@:.d=.tmp)