Ticket #39989: patch-src-include.mak.diff

File patch-src-include.mak.diff, 812 bytes (added by potmj (Michael Pot), 11 years ago)

gcc flags conflict fix for dependent generation

  • src/include.mak

    old new  
    6969SVERSION=$(shell awk '/^\#define HPGS_(MINOR|PATCH)_VERSION/ {printf(".%s",$$3);} /^\#define HPGS_(MAJOR|EXTRA)_VERSION/ {printf("%s",$$3);}' $(srcdir)/hpgs.h)
    7070VERSION=.$(SVERSION)
    7171
     72# Support CCDEP Depends version of gcc invocation (without -arch on Mac OS X for macports +universal)
     73CCDEP=CC
     74
    7275%.depend:  $(srcdir)/%.c
    73         $(CC) $(LIBCFLAGS) $(CFLAGS) -M $< > $@
     76        $(CCDEP) $(LIBCFLAGS) $(CFLAGS) -M $< > $@
    7477
    7578%.$(OBJ): $(srcdir)/%.c
    7679        $(CC) $(LIBCFLAGS) $(CFLAGS) -c $< -o $@
     
    7881all: $(PROGRAM)
    7982
    8083hpgs.depend:  $(srcdir)/hpgs.c
    81         $(CC) $(CFLAGS) -M $< > $@
     84        $(CCDEP) $(CFLAGS) -M $< > $@
    8285
    8386hpgs.$(OBJ): $(srcdir)/hpgs.c
    8487        $(CC) $(CFLAGS) -c $< -o $@