Changeset 49205cf


Ignore:
Timestamp:
May 25, 2015, 4:54:30 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
5d6ce1f
Parents:
367e082 (diff), 448f9b2 (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 assignment-const-field

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/Makefile.in

    r367e082 r49205cf  
    1111## Created On       : Sat May 16 08:05:18 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Mon May 25 09:33:47 2015
    14 ## Update Count     : 4
     13## Last Modified On : Mon May 25 16:22:36 2015
     14## Update Count     : 9
    1515###############################################################################
    1616
     
    1919CFA_LIBDIR = @CFA_LIBDIR@
    2020
    21 LIBRARIES := libcfa.a builtins.cf
     21LIBRARIES := libcfa.a
    2222
    23 all : ${LIBRARIES} Makefile
     23all : ${LIBRARIES} builtins.cf Makefile
    2424
    2525install : all
     
    3030# make forward declarations for gcc builtins
    3131builtins.cf : builtins.c
    32         @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@
     32        @if [ -e builtins.c ] ; then \
     33                @BACKEND_CC@ -E -P $^ | sed -e "/targetm/s/.*//" -e "/_Decimal/s/.*//" -e "s/void (const char \*)0();//" -e "s/\"//g" -e "s/\(__builtin_\) /\1/" > $@ ; \
     34        fi
    3335        ${INSTALL} builtins.cf @CFA_LIBDIR@
    3436
    35 builtins.c : builtins.def
    36         @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@
     37builtins.c : builtins.def prototypes.awk
     38        @if [ -e builtins.def ] ; then \
     39                @BACKEND_CC@ -E prototypes.c | awk -f prototypes.awk > $@ ; \
     40        fi
     41
     42builtins.def :
    3743
    3844libcfa-prelude.c : @CFA_LIBDIR@/cfa-cpp prelude.cf builtins.cf
Note: See TracChangeset for help on using the changeset viewer.