Ignore:
Timestamp:
Jul 5, 2017, 5:37:57 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
bdeba0b
Parents:
0614d14 (diff), 52a9004 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/benchmark/Makefile.in

    r0614d14 rb877fa8  
    306306          esac; \
    307307        done; \
    308         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/benchmark/Makefile'; \
     308        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
    309309        $(am__cd) $(top_srcdir) && \
    310           $(AUTOMAKE) --gnu src/benchmark/Makefile
     310          $(AUTOMAKE) --foreign src/benchmark/Makefile
    311311Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    312312        @case '$?' in \
Note: See TracChangeset for help on using the changeset viewer.