Changeset f8b69da7 for libcfa/prelude


Ignore:
Timestamp:
Aug 29, 2018, 3:23:55 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
a715b5c
Parents:
a42a654 (diff), 546b51e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into cleanup-dtors

Location:
libcfa/prelude
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.am

    ra42a654 rf8b69da7  
    5555# create forward declarations for cfa builtins
    5656builtins.cf : builtins.c ${CC}
    57         ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
     57        ${AM_V_GEN}cfa ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
    5858        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    5959

  • libcfa/prelude/Makefile.in

    ra42a654 rf8b69da7  
    510510# create forward declarations for cfa builtins
    511511builtins.cf : builtins.c ${CC}
    512         ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
     512        ${AM_V_GEN}cfa ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po
    513513        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    514514
Note: See TracChangeset for help on using the changeset viewer.