Mercurial > flash_v2
changeset 1331:22c47e969126
* pkgconf/rules.mak: Remove -finit-priority and -fvtable-gc
from all flags.
| author | jlarmour |
|---|---|
| date | Fri, 24 Oct 2003 18:27:38 +0000 |
| parents | 322a6fa415e0 |
| children | 2c334e9015ab |
| files | packages/ChangeLog packages/pkgconf/rules.mak |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/ChangeLog +++ b/packages/ChangeLog @@ -1,3 +1,8 @@ +2003-10-24 Jonathan Larmour <jifl@eCosCentric.com> + + * pkgconf/rules.mak: Remove -finit-priority and -fvtable-gc + from all flags. + 2003-10-15 Gary Thomas <gary@mlbassoc.com> 2003-09-23 Andrew Lunn <andrew.lunn@ascom.ch>
--- a/packages/pkgconf/rules.mak +++ b/packages/pkgconf/rules.mak @@ -59,12 +59,18 @@ ifneq ($(wildcard *.deps),) include $(wildcard *.deps) endif +# GCC since 2.95 does -finit-priority by default so remove it from old HALs +CFLAGS := $(subst -finit-priority,,$(CFLAGS)) +CFLAGS := $(subst -fvtable-gc,,$(CFLAGS)) + # 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)) +ACTUAL_CXXFLAGS = $(CFLAGS) + # pattern matching rules to generate a library object from source code # object filenames are prefixed to avoid name clashes # a single dependency rule is generated (file extension = ".o.d") @@ -84,7 +90,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_CXXFLAGS) -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) @@ -94,7 +100,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_CXXFLAGS) -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) @@ -127,7 +133,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_CXXFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $< @sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.d=.tmp) > $@ @rm $(@:.d=.tmp) @@ -137,7 +143,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_CXXFLAGS) -Wp,-MD,$(@:.d=.tmp) -o $(@:.d=.o) $< @sed -e '/^ *\\/d' -e "s#.*: #$@: #" $(@:.d=.tmp) > $@ @rm $(@:.d=.tmp)